Finished most of the OPBSD porting work - has trouble with non-EDIT_MODE key input...

Author: gjbauer

edit.h

@@ -31,6 +31,9 @@
 #include <math.h>
 #include <limits.h>
 #include <sys/stat.h>
+#ifdef __OpenBSD__
+#include <unistd.h>
+#endif
 
 //Define color schemes
 #define EDITOR_SCHEME	1
@@ -102,8 +105,8 @@ void key_left(struct Window *, struct Cursor *);
 int dialog_input(struct Window *, char *);
 
 //file.c
-void open(struct Window *, struct File *);
+void open_file(struct Window *, struct File *);
 void save(struct Window *, struct File *);
-void new(struct Window *, struct File *, struct Cursor *);
+void new(struct Window *, struct Cursor *, struct File *);
 
 #endif /* EDIT_H */

file.c

@@ -22,7 +22,7 @@
  */
 #include "edit.h"
 
-void open(struct Window *w, struct File *f)
+void open_file(struct Window *w, struct File *f)
 /*Opens a file, copies the contents, and
  *assesses file permissions
  */
@@ -55,7 +55,7 @@ void save(struct Window *w, struct File *f)
 {
 	f->fp = fopen(f->path, "w");
 
-	if (f->fp)
+	if (!f->ro)
 	{
 		fputs(w->contents, f->fp);
 		fclose(f->fp);
@@ -65,7 +65,7 @@ void save(struct Window *w, struct File *f)
 		mode=SAVE_AS;
 }
 
-void new(struct Window *w, struct File *f, struct Cursor *c)
+void new(struct Window *w, struct Cursor *c, struct File *f)
 //Creates a blank file
 {
 	f->fp=NULL;

input.c

@@ -141,7 +141,9 @@ void get_input(struct Window *w, struct Cursor *c, struct File *f)
 		case KEY_F(4):
 			svdmd=NEW_FILE;
 			if (f->saved)
+			{
 				mode=svdmd;
+			}
 			else
 				mode=NOT_SAVED;
 			break;
@@ -181,7 +183,8 @@ int dialog_input(struct Window *w, char *str)
 	printw(str);
 	switch(k = getch())
 	{
-		case '\n':
+		case 10:
+			str[i]='\0';
 			return 0;
 			break;
 		case KEY_BACKSPACE:
@@ -195,4 +198,5 @@ int dialog_input(struct Window *w, char *str)
 			i++;
 			break;
 	}
+	return 1;
 }

main.c

@@ -28,6 +28,10 @@ char ln[NAME_MAX]="";
 
 int main(int argc, char *argv[])
 {
+	#ifdef __OpenBSD__
+	pledge("stdio rpath wpath cpath tty", NULL);
+	#endif
+	
 	//Initialize all of our core data structures in memory
 	struct Window *w = malloc(sizeof(struct Window));
 	w->contents = calloc(1,array_size(0)*sizeof(char));
@@ -37,12 +41,14 @@ int main(int argc, char *argv[])
 	c->x=0, c->y=0; c->abs=0;		//Make sure our cursor is initialized at position (0, 0)
 
 	struct File *f = malloc(sizeof(struct File));
+	strncpy(f->path, "", PATH_MAX);
+	f->ro=true;
 	f->saved=true;
 
-	if (argc)
+	if (argc>1)
 	{
 		strcpy(f->path, argv[1]);
-		open(w, f);
+		open_file(w, f);
 	}
 
 	//Initialize curses

print.c

@@ -37,6 +37,8 @@ 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);
 }
 
@@ -69,7 +71,7 @@ void content_line_print(int r, struct Window *w, struct Cursor *c)
 	if (r==c->y)
 		j += (long) c->x-(c->x%w->width)-floor(c->x/w->width);
 
-	for (i,j; i < w->width-1 && j+i < get_end_of_line(j, w->contents); i++)	//Repeat the following code segment until the rest of the bar is full
+	for (; i < w->width-1 && j+i < get_end_of_line(j, w->contents); i++)	//Repeat the following code segment until the rest of the bar is full
 	{
 		if(w->contents[j+i]!='\t')
 			addch(w->contents[j+i]);
@@ -113,6 +115,7 @@ bool msg_box(struct Window *w, char *msg)
 			return false;
 			break;
 	}
+	return NULL;
 }
 
 void dialog(struct Window *w, char *prompt, char *msg)
@@ -136,6 +139,7 @@ void run_mode(int m, struct Window *w, struct Cursor *c, struct File *f)
  *based upon the current given mode of operation
  */
 {
+	int rep;
 	switch (m)
 	{
 		case EDIT_MODE:
@@ -156,16 +160,17 @@ void run_mode(int m, struct Window *w, struct Cursor *c, struct File *f)
 			dialog(w, "File path:", "Open File");
 			if(!dialog_input(w,f->path))
 			{
-				open(w,f);
+				open_file(w,f);
 				m=EDIT_MODE;
 			}
 			break;
 		case NEW_FILE:
 			dialog(w, "File path:", "New File");
 			if(!dialog_input(w,f->path))
 			{
-				new(w,f,c);
-				if (f->fp = fopen(f->path, "w"))
+				new(w,c,f);
+				f->fp = fopen(f->path, "w");
+				if (f->fp)
 				{
 					f->ro=false;
 					fclose(f->fp);