Corrected segfault issues when using cin and failures in specifying e…

…ncodings

.editorconfig

@@ -0,0 +1,9 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.{c,h,cpp,hpp}]
+indent_style = tab
+indent_size = 2

CMakeLists.txt

@@ -3,7 +3,7 @@ include(GNUInstallDirs)
 
 # define project
 cmake_minimum_required (VERSION 3.5)
-project (jstrings VERSION 1.1 LANGUAGES CXX)
+project (jstrings VERSION 1.2 LANGUAGES CXX)
 set(PROJECT_CONTACT "Damian R ([email protected])")
 set(PROJECT_WEBSITE "https://github.com/drojaazu")
 

inc/enc_cp932.h

@@ -13,11 +13,11 @@
 namespace encodings
 {
 
-class cp932 : public shift_jis
+class encoding_cp932 : public encoding_shiftjis
 {
 public:
 	u8 is_valid(u8 const *data);
-	~cp932(){};
+	~encoding_cp932(){};
 };
 
 } // namespace encodings

inc/enc_eucjp.h

@@ -11,12 +11,12 @@
 namespace encodings
 {
 
-class euc : public encoding
+class encoding_eucjp : public encoding
 {
 public:
-	euc() : encoding(3){};
+	encoding_eucjp() : encoding(3){};
 	u8 is_valid(u8 const *data);
-	~euc(){};
+	~encoding_eucjp(){};
 };
 
 } // namespace encodings

inc/enc_shiftjis.h

@@ -12,12 +12,12 @@
 namespace encodings
 {
 
-class shift_jis : public encoding
+class encoding_shiftjis : public encoding
 {
 public:
-	shift_jis() : encoding(2){};
+	encoding_shiftjis() : encoding(2){};
 	u8 is_valid(u8 const *data);
-	~shift_jis(){};
+	~encoding_shiftjis(){};
 };
 
 } // namespace encodings

inc/types.h

@@ -29,21 +29,4 @@ template <typename T> using sptr = std::shared_ptr<T>;
 
 typedef std::map<std::string const, std::string> kvmap;
 
-/*!
- * \brief POD structure for containing a found string
- */
-class found_string
-{
-public:
-	/*!
-	 * \brief The offset of the beginning of the found string relative to the
-	 * start of the stream
-	 */
-	off_t address;
-	/*!
-	 * \brief The extracted string data
-	 */
-	std::vector<uint8_t> data;
-};
-
 #endif

src/enc_cp932.cpp

@@ -3,9 +3,9 @@
 namespace encodings
 {
 
-u8 cp932::is_valid(u8 const *data)
+u8 encoding_cp932::is_valid(u8 const *data)
 {
-	u8 valid_count = shift_jis::is_valid(data);
+	u8 valid_count = encoding_shiftjis::is_valid(data);
 	if(valid_count > 0)
 		return valid_count;
 	else {

src/enc_eucjp.cpp

@@ -5,7 +5,7 @@
 
 namespace encodings
 {
-u8 euc::is_valid(u8 const *data)
+u8 encoding_eucjp::is_valid(u8 const *data)
 {
 
 	u8 c_hi{*data};

src/enc_shiftjis.cpp

@@ -10,7 +10,7 @@ namespace encodings
 	0208 There is extended support for 0213, though we're not going to fiddle with
 	it Maybe we'll make an extended class
 */
-u8 shift_jis::is_valid(u8 const *data)
+u8 encoding_shiftjis::is_valid(u8 const *data)
 {
 	// JIS X 0201 - 8-bit characters (including 7-bit ASCII)
 	// excludes non-printable (control code) and reserved bytes