rmultimarkdown 6.4.0.4 → 6.7.0.0

data/ext/mmd/file.c

@@ -119,38 +119,48 @@
 /// Scan file into a DString
 DString * scan_file(const char * fname) {
 	/* Read from stdin and return a DString *
-		`buffer` will need to be freed elsewhere */
+	 `buffer` will need to be freed elsewhere */
 
 	char chunk[kBUFFERSIZE];
 	size_t bytes;
 
 	FILE * file;
 
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	int wchars_num = MultiByteToWideChar(CP_UTF8, 0, fname, -1, NULL, 0);
 	wchar_t wstr[wchars_num];
 	MultiByteToWideChar(CP_UTF8, 0, fname, -1, wstr, wchars_num);
 
 	if ((file = _wfopen(wstr, L"rb")) == NULL) {
-	#else
+		return NULL;
+	}
 
-	if ((file = fopen(fname, "r")) == NULL ) {
-	#endif
+#else
 
+	if ((file = fopen(fname, "r")) == NULL ) {
 		return NULL;
 	}
 
+#endif
+
 	DString * buffer = d_string_new("");
 
 	while ((bytes = fread(chunk, 1, kBUFFERSIZE, file)) > 0) {
 		d_string_append_c_array(buffer, chunk, bytes);
+	}
 
-		if (buffer->currentStringLength <= kBUFFERSIZE) {
-			// Strip BOM
-			if (strncmp(buffer->str, "\xef\xbb\xbf", 3) == 0) {
-				d_string_erase(buffer, 0, 3);
-			}
-		}
+	// Strip UTF-8 BOM
+	if (strncmp(buffer->str, "\xef\xbb\xbf", 3) == 0) {
+		d_string_erase(buffer, 0, 3);
+	}
+
+	// Strip UTF-16 BOMs
+	if (strncmp(buffer->str, "\xef\xff", 2) == 0) {
+		d_string_erase(buffer, 0, 2);
+	}
+
+	if (strncmp(buffer->str, "\xff\xfe", 2) == 0) {
+		d_string_erase(buffer, 0, 2);
 	}
 
 	fclose(file);
@@ -160,7 +170,7 @@ DString * scan_file(const char * fname) {
 
 
 /// Scan from stdin into a DString
-DString * stdin_buffer() {
+DString * stdin_buffer(void) {
 	/* Read from stdin and return a GString *
 		`buffer` will need to be freed elsewhere */
 
@@ -182,38 +192,38 @@ DString * stdin_buffer() {
 /// Windows can use either `\` or `/` as a separator -- thanks to t-beckmann on github
 ///	for suggesting a fix for this.
 bool is_separator(char c) {
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	return c == '\\' || c == '/';
-	#else
+#else
 	return c == '/';
-	#endif
+#endif
 }
 
 
 #ifdef TEST
-void Test_is_separator(CuTest* tc) {
+void Test_is_separator(CuTest * tc) {
 	char * test = "a/\\";
 
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	CuAssertIntEquals(tc, false, is_separator(test[0]));
 	CuAssertIntEquals(tc, true, is_separator(test[1]));
 	CuAssertIntEquals(tc, true, is_separator(test[2]));
-	#else
+#else
 	CuAssertIntEquals(tc, false, is_separator(test[0]));
 	CuAssertIntEquals(tc, true, is_separator(test[1]));
 	CuAssertIntEquals(tc, false, is_separator(test[2]));
-	#endif
+#endif
 }
 #endif
 
 
 /// Ensure that path ends in separator
 void add_trailing_sep(DString * path) {
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	char sep = '\\';
-	#else
+#else
 	char sep = '/';
-	#endif
+#endif
 
 	// Ensure that folder ends in separator
 	if ((path->currentStringLength == 0) || (!is_separator(path->str[path->currentStringLength - 1]))) {
@@ -234,7 +244,7 @@ static char * my_strndup(const char * source, size_t n) {
 
 	// strlen is too slow if strlen(source) >> n
 	for (len = 0; len < n; ++len) {
-		if (test == '\0') {
+		if (*test == '\0') {
 			break;
 		}
 
@@ -301,17 +311,17 @@ char * path_from_dir_base(const char * dir, const char * base) {
 
 
 #ifdef TEST
-void Test_path_from_dir_base(CuTest* tc) {
+void Test_path_from_dir_base(CuTest * tc) {
 	char dir[10] = "/foo";
 	char base[10] = "bar";
 
 	char * path = path_from_dir_base(dir, base);
 
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	CuAssertStrEquals(tc, "/foo\\bar", path);
-	#else
+#else
 	CuAssertStrEquals(tc, "/foo/bar", path);
-	#endif
+#endif
 
 	free(path);
 	strcpy(base, "/bar");
@@ -334,11 +344,11 @@ void Test_path_from_dir_base(CuTest* tc) {
 void split_path_file(char ** dir, char ** file, const char * path) {
 	const char * slash = path, * next;
 
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	const char sep[] = "\\/";	// Windows allows either variant
-	#else
+#else
 	const char sep[] = "/";
-	#endif
+#endif
 
 	while ((next = strpbrk(slash + 1, sep))) {
 		slash = next;
@@ -359,7 +369,7 @@ void split_path_file(char ** dir, char ** file, const char * path) {
 
 
 #ifdef TEST
-void Test_split_path_file(CuTest* tc) {
+void Test_split_path_file(CuTest * tc) {
 	char * dir, * file;
 
 	char * path = "/foo/bar.txt";
@@ -371,13 +381,13 @@ void Test_split_path_file(CuTest* tc) {
 	path = "\\foo\\bar.txt";
 	split_path_file(&dir, &file, path);
 
-	#if defined(__WIN32)
+#if defined(__WIN32)
 	CuAssertStrEquals(tc, "\\foo\\", dir);
 	CuAssertStrEquals(tc, "bar.txt", file);
-	#else
+#else
 	CuAssertStrEquals(tc, "", dir);
 	CuAssertStrEquals(tc, "\\foo\\bar.txt", file);
-	#endif
+#endif
 }
 #endif
 
@@ -388,15 +398,15 @@ void Test_split_path_file(CuTest* tc) {
 // Let compiler know where to find GetFullPathName()
 #include <windows.h>
 
-char *realpath(const char *path, char *resolved_path) {
+char * realpath(const char * path, char * resolved_path) {
 	DWORD  retval = 0;
 	DWORD  dwBufSize = 0; // Just in case MAX_PATH differs from PATH_MAX
-	TCHAR  *buffer = NULL;
+	TCHAR * buffer = NULL;
 
 	if (resolved_path == NULL) {
 		// realpath allocates appropiate bytes if resolved_path is null. This is to mimic realpath behavior
 		dwBufSize = PATH_MAX; // Use windows PATH_MAX constant, because we are in Windows context now.
-		buffer = (char*)malloc(dwBufSize);
+		buffer = (char *)malloc(dwBufSize);
 
 		if (buffer == NULL) {
 			return NULL; // some really weird is going on...
@@ -421,15 +431,15 @@ char *realpath(const char *path, char *resolved_path) {
 // Convert argument to absolute path
 char * absolute_path_for_argument(const char * arg) {
 	char * result = NULL;
-	#ifdef PATH_MAX
+#ifdef PATH_MAX
 	// If PATH_MAX defined, use it
 	char absolute[PATH_MAX + 1];
 	realpath(arg, absolute);
 	result = my_strdup(absolute);
-	#else
+#else
 	// If undefined, then we *should* be able to use a NULL pointer to allocate
 	result = realpath(arg, NULL);
-	#endif
+#endif
 
 	return result;
 }

data/ext/mmd/file.h

@@ -121,7 +121,7 @@ DString * scan_file(const char * fname);
 
 
 /// Scan from stdin into a DString
-DString * stdin_buffer();
+DString * stdin_buffer(void);
 
 
 /// Windows can use either `\` or `/` as a separator -- thanks to t-beckmann on github
@@ -147,7 +147,7 @@ char * absolute_path_for_argument(const char * arg);
 
 #if (defined(_WIN32) || defined(__WIN32__))
 	// Windows does not know realpath(), so we need a "windows port"
-	char *realpath(const char *path, char *resolved_path);
+	char * realpath(const char * path, char * resolved_path);
 #endif
 
 #endif