UNIX cleanup refactoring to fix unix console build

Author: chrisws

COPYING

@@ -27,10 +27,10 @@ bin_PROGRAMS = sbasic
 sbasic_SOURCES =																\
 		dev_ndcfb.c																	\
 	  dev_genfb.c																	\
-		device.c																		\
 		dev_oss.c																		\
 		dev_term.c																	\
 	  console_main.c															\
+		../../common/device.c												\
     ../../common/g_line.c												\
 	  ../../common/decomp.c
 
@@ -40,4 +40,4 @@ if !WITH_WIN32
 sbasic_LDADD += -ldl
 endif
 
-sbasic_DEPENDENCIES = ../libsb_common.a
+sbasic_DEPENDENCIES = $(top_srcdir)/src/common/libsb_common.a

src/platform/unix/Makefile.am

@@ -1,60 +1,55 @@
 #include <stdio.h>
 #include <string.h>
 
-void	change_ext(char *name, char *ext)
-{
-	char	*e = ext;
-	char	*p;
-
-	p = strrchr(name, '.');
-	if	( *e == '.' )
-		e ++;
-
-	if	( p )	{
-		*(p+1) = '\0';
-		strcat(name, e);
-		}
-	else	{
-		strcat(name, ".");
-		strcat(name, e);
-		}
+void change_ext(char *name, char *ext) {
+  char *e = ext;
+  char *p;
+
+  p = strrchr(name, '.');
+  if (*e == '.')
+    e++;
+
+  if (p) {
+    *(p + 1) = '\0';
+    strcat(name, e);
+  } else {
+    strcat(name, ".");
+    strcat(name, e);
+  }
 }
 
-void	font2c(const char *file_name)
-{
-	FILE	*fin, *fout;
-	char	new_name[1024];
-	char	buff[4096];
-	int		i;
-
-	fin = fopen(file_name, "rb");
-	if	( fin )	{
-		strcpy(new_name, file_name);
-		change_ext(new_name, ".c");
-		fout = fopen(new_name, "wb");
-		
-		fread(buff, 4096, 1, fin);
-
-		fprintf(fout, "unsigned char font8x16[] = {\n");
-		for ( i = 0; i < 4096; i ++ )	{
-			fprintf(fout, "0x%02X, ", (unsigned char) buff[i]);
-			if	( (i % 16) == 0 )
-				fprintf(fout, "\n");
-			}
-		fprintf(fout, "0 };\n");
-		 
-		fclose(fin);
-		fclose(fout);
-		}
-	else
-		perror("font2c");
+void font2c(const char *file_name) {
+  FILE *fin, *fout;
+  char new_name[1024];
+  char buff[4096];
+  int i;
+
+  fin = fopen(file_name, "rb");
+  if (fin) {
+    strcpy(new_name, file_name);
+    change_ext(new_name, ".c");
+    fout = fopen(new_name, "wb");
+
+    fread(buff, 4096, 1, fin);
+
+    fprintf(fout, "unsigned char font8x16[] = {\n");
+    for (i = 0; i < 4096; i++) {
+      fprintf(fout, "0x%02X, ", (unsigned char)buff[i]);
+      if ((i % 16) == 0)
+        fprintf(fout, "\n");
+    }
+    fprintf(fout, "0 };\n");
+
+    fclose(fin);
+    fclose(fout);
+  } else
+    perror("font2c");
 }
 
-int main(int argc, char *argv[])
-{
-	int		i;
+int main(int argc, char *argv[]) {
+  int i;
 
-	for ( i = 1; i < argc; i ++ )
-		font2c(argv[i]);
-	return 0;
+  for (i = 1; i < argc; i++)
+    font2c(argv[i]);
+  return 0;
 }

src/platform/unix/chr2c

@@ -49,10 +49,10 @@ void remove_temp_file(void) {
 void set_bas_dir(const char *cwd, const char *bas_file) {
   char bas_dir[OS_PATHNAME_SIZE + 10];
   int path_len = strrchr(bas_file, OS_DIRSEP) - bas_file;
-  
+
   bas_dir[0] = 0;
   strcat(bas_dir, "BASDIR=");
-  
+
   if (bas_file[0] == OS_DIRSEP) {
     // full path
     strncat(bas_dir, bas_file, path_len + 1);
@@ -312,7 +312,6 @@ int process_options(int argc, char *argv[]) {
       // check if it is a terminal.
       opt_interactive = 1;
     }
-
 #if defined(_Win32) || defined(_DOS)
     char *slash = strchr(argv[0], OS_DIRSEP);
     if (slash) {
@@ -327,7 +326,7 @@ int process_options(int argc, char *argv[]) {
 #elif defined(_UnixOS)
     sprintf(g_file, "%ctmp%csb%d.bas", OS_DIRSEP, OS_DIRSEP, getpid());
 #else
-    sprintf(g_file, "sb%d.bas", getpid());  // for minimal GNU systems like 
+    sprintf(g_file, "sb%d.bas", getpid());      // for minimal GNU systems like 
     // MINGW
 #endif
 
@@ -390,7 +389,6 @@ int MAIN_FUNC(int argc, char *argv[]) {
     if (!opt_quiet) {
       printf("SmallBASIC version %s, use -h for help\n", SB_STR_VER);
     }
-
     // run it
     if (!opt_interactive) {
       sbasic_main(g_file);