Merge branch 'master' of github.com:fletcher/c-template

Author: fletcher

CMakeLists.txt

@@ -7,15 +7,15 @@ cmake_minimum_required (VERSION 2.6)
 
 set (My_Project_Title "Some Project")
 set (My_Project_Description "A project built using the c-template system.")
-set (My_Project_Author "Somebody")
-set (My_Project_Revised_Date "2015-06-05")
+set (My_Project_Author "Fletcher T. Penney")
+set (My_Project_Revised_Date "2016-05-06")
 set (My_Project_Version_Major 1)
 set (My_Project_Version_Minor 0)
-set (My_Project_Version_Patch 1)
+set (My_Project_Version_Patch 2)
 
 set (My_Project_Version "${My_Project_Version_Major}.${My_Project_Version_Minor}.${My_Project_Version_Patch}")
 
-set (My_Project_Copyright_Date "2015")
+set (My_Project_Copyright_Date "2015-2016")
 set (My_Project_Copyright "Copyright © ${My_Project_Copyright_Date} ${My_Project_Author}.")
 
 string(TOUPPER ${My_Project_Title} My_Project_Title_Caps  )

src/GLibFacade.c

@@ -5,7 +5,7 @@
  *		https://github.com/fletcher/MultiMarkdown-4/
  *
  *	Created by Daniel Jalkut on 7/26/11.
- *  Modified by Fletcher T. Penney on 9/15/11.
+ *  Modified by Fletcher T. Penney 9/15/11 - 5/6/16.
  *  Modified by Dan Lowe on 1/3/12.
  *	Copyright 2011 __MyCompanyName__. All rights reserved.
  */
@@ -137,6 +137,17 @@ void g_string_append_c(GString* baseString, char appendedCharacter)
 	baseString->str[baseString->currentStringLength] = '\0';
 }
 
+void g_string_append_c_array(GString *baseString, char * appendedChars, size_t bytes)
+{
+	size_t newSizeNeeded = baseString->currentStringLength + bytes;
+	ensureStringBufferCanHold(baseString, newSizeNeeded);
+
+	memcpy(baseString->str + baseString->currentStringLength,appendedChars, bytes);
+
+	baseString->currentStringLength = newSizeNeeded;
+	baseString->str[baseString->currentStringLength] = '\0';
+}
+
 void g_string_append_printf(GString* baseString, char* format, ...)
 {
 	va_list args;

src/GLibFacade.h

@@ -6,6 +6,9 @@
  *
  *	Created by Daniel Jalkut on 7/26/11.
  *	Copyright 2011 __MyCompanyName__. All rights reserved.
+ *
+ *	Modified by Fletcher T. Penney
+ *	Changes Copyright 2011-2016
  */
 
 #ifndef __MARKDOWN_GLIB_FACADE__
@@ -51,6 +54,7 @@ GString* g_string_new(char *startingString);
 char* g_string_free(GString* ripString, bool freeCharacterData);
 
 void g_string_append_c(GString* baseString, char appendedCharacter);
+void g_string_append_c_array(GString *baseString, char * appendedChars, size_t bytes);
 void g_string_append(GString* baseString, char *appendedString);
 
 void g_string_prepend(GString* baseString, char* prependedString);

src/main.c

@@ -2,7 +2,7 @@
 
 	main.c -- Template main()
 
-	Copyright © 2015 Fletcher T. Penney.
+	Copyright © 2015-2016 Fletcher T. Penney.
 
 
 	This program is free software you can redistribute it and/or modify
@@ -26,24 +26,48 @@
 
 #include "GLibFacade.h"
 
-char * stdin_buffer() {
-	/* Read from stdin and return a char *
-		`result` will need to be freed elsewhere */
+#define kBUFFERSIZE 4096	// How many bytes to read at a time
+
+GString * stdin_buffer() {
+	/* Read from stdin and return a GString *
+		`buffer` will need to be freed elsewhere */
+
+	char chunk[kBUFFERSIZE];
+	size_t bytes;
 
 	GString * buffer = g_string_new("");
-	char curchar;
-	char * result;
 
-	while ((curchar = fgetc(stdin)) != EOF)
-		g_string_append_c(buffer, curchar);
+    while ((bytes = fread(chunk, 1, kBUFFERSIZE, stdin)) > 0) {
+    	g_string_append_c_array(buffer, chunk, bytes);
+    }
 
 	fclose(stdin);
 
-	result = buffer->str;
+	return buffer;
+}
+
+GString * scan_file(char * fname) {
+	/* Read from stdin and return a GString *
+		`buffer` will need to be freed elsewhere */
+
+	char chunk[kBUFFERSIZE];
+	size_t bytes;
+
+	FILE * file;
+
+	if ((file = fopen(fname, "r")) == NULL ) {
+		return NULL;
+	}
+
+	GString * buffer = g_string_new("");
+
+    while ((bytes = fread(chunk, 1, kBUFFERSIZE, file)) > 0) {
+    	g_string_append_c_array(buffer, chunk, bytes);
+    }
 
-	g_string_free(buffer, false);
+	fclose(file);
 
-	return result;
+	return buffer;
 }
 
 int main( int argc, char** argv ) {