Merge pull request #1785 from ccoffing/portable-build-fixes

Portable build fixes
ghaerr · Jan 9, 2024 · 5fe82e3 · 5fe82e3
2 parents b423cce + 729ea23
commit 5fe82e3
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 20 deletions.
diff --git a/elkscmd/ash/error.c b/elkscmd/ash/error.c
@@ -67,7 +67,6 @@ struct jmploc *handler;
 int exception;
 volatile int suppressint;
 volatile int intpending;
-char *commandname;
 
 
 /*

diff --git a/elkscmd/ash/var.c b/elkscmd/ash/var.c
@@ -80,6 +80,7 @@ struct var vps2;
 struct var vpse;
 struct var vvers;
 struct var vterm;
+struct localvar *localvars;
 
 const struct varinit varinit[] = {
 #if ATTY

diff --git a/elkscmd/ash/var.h b/elkscmd/ash/var.h
@@ -64,7 +64,7 @@ struct localvar {
 };
 
 
-struct localvar *localvars;
+extern struct localvar *localvars;
 
 #if ATTY
 extern struct var vatty;

diff --git a/elkscmd/disk_utils/mkfs.c b/elkscmd/disk_utils/mkfs.c
@@ -57,10 +57,7 @@
 #include <linuxmt/fs.h>
 #include <linuxmt/minix_fs.h>
 
-/* Check for gcc removed from here. */
-
-#ifndef __linux__
-#define volatile
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
 
@@ -152,12 +149,7 @@ unsigned char test_bit(unsigned int nr, void * add)
 #define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1))
 #define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1))
 
-/*
- * Volatile to let gcc know that this doesn't return. When trying
- * to compile this under minix, volatile gives a warning, as
- * exit() isn't defined as volatile under minix.
- */
-volatile void fatal_error(const char * fmt_string,int status)
+void fatal_error(const char * fmt_string,int status)
 {
 	printf(fmt_string);
 	exit(status);

diff --git a/elkscmd/file_utils/l.c b/elkscmd/file_utils/l.c
@@ -8,6 +8,7 @@
  * by commas
  */
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/elkscmd/sys_utils/chmem.c b/elkscmd/sys_utils/chmem.c
@@ -176,7 +176,7 @@ int do_chmem(char *filename, int changeheap, int changestack,
 int
 main(int argc, char **argv)
 {
-	int 			ch, err;
+	int 			ch, err = 0;
 	int				changeheap = 0, changestack = 0;
 	unsigned long	heap = 0, stack = 0;
 

diff --git a/elkscmd/xvi/xvi.c b/elkscmd/xvi/xvi.c
@@ -50,7 +50,6 @@
 /* #include	<sgtty.h>                                           tjp*/
 #include	<ctype.h>
 #include	<stdio.h>
-#include	<sys/file.h>
 #include	<sys/stat.h>
 #include	<signal.h>
 #include	<setjmp.h>

diff --git a/libc/malloc/__mini_malloc.c b/libc/malloc/__mini_malloc.c
@@ -7,11 +7,11 @@
 void *
 __mini_malloc(size_t size)
 {
-	register mem *ptr;
-	register unsigned int sz;
+	mem *ptr;
+	size_t sz;
 
 	/* First time round this _might_ be odd, But we won't do that! */
-	sz = (unsigned int)sbrk(0);
+	sz = (size_t)sbrk(0);
 	if(sz & (sizeof(mem) - 1))
 		sbrk(4 - (sz & (sizeof(mem) - 1)));
 
@@ -29,7 +29,7 @@ __mini_malloc(size_t size)
 	size /= sizeof(mem);
 
 	ptr = (mem *) sbrk(size * sizeof(mem));
-	if((int)ptr == -1)
+	if((intptr_t)ptr == -1)
 		return 0;
 
 	m_size(ptr) = size;

diff --git a/libc/termcap/tgetent.c b/libc/termcap/tgetent.c
@@ -290,7 +290,7 @@ int li, co;
 int
 tgetent(char *bp, const char *name)
 {
-  register char *termcap_name;
+  char *termcap_name, *term_name;
   register int fd;
   struct termcap_buffer buf;
   register char *bp1;
@@ -320,7 +320,7 @@ tgetent(char *bp, const char *name)
      it is the entry itself, but only if
      the name the caller requested matches the TERM variable.  */
 
-  if (termcap_name && !filep && !strcmp (name, getenv ("TERM")))
+  if (termcap_name && !filep && (term_name = getenv("TERM")) && !strcmp (name, term_name))
     {
       indirect = termcap_tgetst1 (termcap_find_capability (termcap_name, "tc"), (char **) 0);
       if (!indirect)