Fixed a bug that arose during the last bit of clean-up. Now should run well as a beta on Linux and OPBSD systems at least

Author: gjbauer

edit.h

@@ -89,7 +89,7 @@ void content_line_print(int, struct Window *, struct Cursor *);	//Print line at
 void print_contents(struct Window *, struct Cursor *, struct File *);	//Prints the inner contents of the editor
 void dialog(struct Window *, char *, char *);
 bool msg_box(struct Window *, char *);
-void run_mode(int, struct Window *, struct Cursor *, struct File *);
+void run_mode(int *, struct Window *, struct Cursor *, struct File *);
 
 //text.c
 int get_line_number_pos(int, char *);					//Gets the position of the line number 'line' in text 'text'

file.c

@@ -55,7 +55,7 @@ void save(struct Window *w, struct File *f)
 {
 	f->fp = fopen(f->path, "w");
 
-	if (!f->ro)
+	if (f->fp)
 	{
 		fputs(w->contents, f->fp);
 		fclose(f->fp);

input.c

@@ -25,7 +25,8 @@
 void repos_x(struct Window *w, struct Cursor *c)
 /*When the cursor's x-position is greater than the
  *length of the given line, move the cursor back
- *to the end of the given line*/
+ *to the end of the given line
+ */
 {
 	int max, pos=get_line_number_pos(c->y, w->contents);
 	max=get_end_of_line(pos, w->contents);
@@ -40,7 +41,8 @@ void repos_x(struct Window *w, struct Cursor *c)
 
 void key_up(struct Window *w, struct Cursor *c)
 /*When in edit-mode and the up arrow key is pressed,
- *do this*/
+ *do this
+ */
 {
 	if (c->y>0)
 	{
@@ -55,7 +57,8 @@ void key_up(struct Window *w, struct Cursor *c)
 
 void key_down(struct Window *w, struct Cursor *c)
 /*When in edit-mode and the down arrow key is pressed,
- *do this*/
+ *do this
+ */
 {
 	if (get_line_number_pos(c->y+1, w->contents)!=EOF)
 	{
@@ -70,7 +73,8 @@ void key_down(struct Window *w, struct Cursor *c)
 
 void key_right(struct Window *w, struct Cursor *c)
 /*When in edit-mode and the right arrow key is pressed,
- *do this*/
+ *do this
+ */
 {
 	if (w->contents[c->abs]!='\n'&&w->contents[c->abs]!='\0')
 	{
@@ -86,7 +90,8 @@ void key_right(struct Window *w, struct Cursor *c)
 
 void key_left(struct Window *w, struct Cursor *c)
 /*When in edit-mode and the left arrow key is pressed,
- *do this*/
+ *do this
+ */
 {
 	int i = get_line_number_pos(c->y, w->contents);
 	i += c->x;
@@ -108,7 +113,8 @@ void key_left(struct Window *w, struct Cursor *c)
 
 void get_input(struct Window *w, struct Cursor *c, struct File *f)
 /*When in edit-mode and getting user input,
- *do this*/
+ *do this
+ */
 {
 	int k;
 	switch(k = getch())
@@ -183,7 +189,7 @@ int dialog_input(struct Window *w, char *str)
 	printw(str);
 	switch(k = getch())
 	{
-		case 10:
+		case '\n':
 			str[i]='\0';
 			return 0;
 			break;

main.c

@@ -42,6 +42,7 @@ int main(int argc, char *argv[])
 
 	struct File *f = malloc(sizeof(struct File));
 	strncpy(f->path, "", PATH_MAX);
+	strncpy(f->filename, "", NAME_MAX);
 	f->ro=true;
 	f->saved=true;
 
@@ -56,7 +57,7 @@ int main(int argc, char *argv[])
 	while(1)	//Run until user quits application
 	{
 		getmaxyx(stdscr, w->height, w->width); //Get the dimensions of current screen (stdscr) and place those values into the Window structure
-		run_mode(mode, w, c, f);	//Print to the console according to our mode of operation
+		run_mode(&mode, w, c, f);	//Print to the console according to our mode of operation
 		refresh();
 		clear();
 	}

print.c

@@ -37,8 +37,6 @@ void initialize_editor()
 	init_pair(BOUNDARY_SCHEME, COLOR_BLACK, COLOR_CYAN);	//Initialize color pair of black text on a cyan background (for top and bottom boundaries)
 	keypad(stdscr, true);
 	cbreak();
-	//raw();
-	//nonl();
 	curs_set(1);
 }
 
@@ -134,13 +132,12 @@ void dialog(struct Window *w, char *prompt, char *msg)
 	move(w->height-1, strlen(prompt));
 }
 
-void run_mode(int m, struct Window *w, struct Cursor *c, struct File *f)
+void run_mode(int *m, struct Window *w, struct Cursor *c, struct File *f)
 /*Prints to the console the coresponding output
  *based upon the current given mode of operation
  */
 {
-	int rep;
-	switch (m)
+	switch (*m)
 	{
 		case EDIT_MODE:
 			dialog(w, "[Ctrl+c] Quit  [F1] Save  [F2] Save as  [F3] Open  [F4] New  [F5] Delete line", "Unnamed Text Editor");
@@ -151,17 +148,17 @@ void run_mode(int m, struct Window *w, struct Cursor *c, struct File *f)
 			if(msg_box(w, "File not saved! Do you want to continue?"))
 			{
 				strcpy(f->path, "");
-				m=svdmd;
+				*m=svdmd;
 			}
 			else
-				m=EDIT_MODE;
+				*m=EDIT_MODE;
 			break;
 		case OPEN_FILE:
 			dialog(w, "File path:", "Open File");
 			if(!dialog_input(w,f->path))
 			{
 				open_file(w,f);
-				m=EDIT_MODE;
+				*m=EDIT_MODE;
 			}
 			break;
 		case NEW_FILE:
@@ -175,23 +172,23 @@ void run_mode(int m, struct Window *w, struct Cursor *c, struct File *f)
 					f->ro=false;
 					fclose(f->fp);
 				}
-				m=EDIT_MODE;
+				*m=EDIT_MODE;
 			}
 			break;
 		case DEL_LINE:
 			dialog(w, "Line number:", "Delete Line");
 			if(!dialog_input(w,ln))
 			{
 				del_line(atoi(ln)-1, w->contents);
-				m=EDIT_MODE;
+				*m=EDIT_MODE;
 			}
 			break;
 		case SAVE_AS:
 			dialog(w, "File path:", "Save As");
 			if(!dialog_input(w,f->path))
 			{
 				save(w, f);
-				m=EDIT_MODE;
+				*m=EDIT_MODE;
 			}
 			break;
 	}

text.c

@@ -24,7 +24,8 @@
 
 int get_line_number_pos(int line, char *text)
 /*Returns the position of the line-nth line
- *in a character array 'text'*/
+ *in a character array 'text'
+ */
 {
 	long long i, j;
 
@@ -51,7 +52,8 @@ int get_end_of_line(int start, char *text)
  *this function returns the position of the end
  *of the given line at that position, whether the
  *line is the end of the array (aka '\0') or the
- *start of a new line (aka '\n')*/
+ *start of a new line (aka '\n')
+ */
 {
 	int i;
 	for (i = start; text[i]!='\0' && text[i]!='\n'; i++);
@@ -62,7 +64,8 @@ unsigned long long array_size(int k)
 /*Base-2 dynamic array size function. It takes a length k
  *and finds the closest base of two that is equal to or
  *larger than the given k value - used to determine malloc()
- *sizes for text-content in a dynamic setting*/
+ *sizes for text-content in a dynamic setting
+ */
 {
 	unsigned len = (unsigned)floor(log(k)/log(2));
 	return pow(2,len+1);
@@ -72,13 +75,15 @@ void ins_char(int pos, char k, char *str)
 /*The basic functionality of most of the editor
  *relies on this function. It is simply used to
  *insert a character into the text from the given
- *cursor position.*/
+ *cursor position.
+ */
 {
 	if(strlen(str)==array_size(strlen(str)))
 	/*If we have reached the end of the dynamic array,
 	 *we make a copy of its contents and then resize
 	 *the original to be double the previous size, copy
-	 *the contents back in.*/
+	 *the contents back in.
+	 */
 	{
 		char *resize = (char*) calloc(1, strlen(str));
 		strcpy(resize, str);