replace exit() with _exit() (-fanalyzer), some malloc checking

(#31)

src/cmdlex.l

@@ -51,8 +51,11 @@ flexYyInput(char *buf,int maxsize)
 
 static Cmdstat cmdstat;
 
-int
-yywrap(void)
+int yywrap(void);
+#ifdef __cplusplus
+extern "C"
+#endif
+int yywrap(void)
 {
 	return 1;
 }

src/commx.c

@@ -7,6 +7,7 @@
 #include "defs.h"
 #include "commx.h"              /*(commxForkExec) */
 #include "verbose.h"            /*VERB_MISC */
+#include "utils.h"
 static int commxPid;
 
 static void
@@ -20,8 +21,9 @@ sigchld (int dummy)
   {
     fputs (_("Comm program exited.\r\n"), stderr);
     verboseOut (VERB_MISC, _("Child returned status %d.\r\n"),
-                WEXITSTATUS (s));
-    exit (0);
+                WEXITSTATUS (s));\
+
+    _exit (0);
   }
 }
 
@@ -55,10 +57,19 @@ commxForkExec (const char *cmd, char *ptyslave)
 {
   char *s;
   s = malloc (strlen (cmd) + strlen (ptyslave) + 1);
-  if (strcmp ("/dev/", ptyslave) == 0)
-    ptyslave += 5;
-  sprintf (s, cmd, ptyslave);
-  forkExec (s);
+  chk_alloc (s);
+  if (s != NULL)
+  {
+    if (strcmp ("/dev/", ptyslave) == 0)
+      ptyslave += 5;
+    sprintf (s, cmd, ptyslave);
+    forkExec (s);
+    return;
+  }
+  else
+  {
+    return;
+  }
 }
 #else
 void
@@ -72,7 +83,16 @@ commxForkExec (const char *cmd, char c10, char c01)
   c[4] = c01;
   c[5] = 0;
   s = malloc (strlen (cmd) + strlen (c) + 1);
-  sprintf (s, cmd, c);          /*'%s' -> 'p1' or sth */
-  forkExec (s);
+  chk_alloc (s);
+  if (s != NULL)
+  {
+    sprintf (s, cmd, c);          /*'%s' -> 'p1' or sth */
+    forkExec (s);
+    return;
+  }
+  else
+  {
+    return;
+  }
 }
 #endif

src/modemu2k.c

@@ -52,6 +52,7 @@
 #include "timeval.h"            /*(timeval...) */
 #include "commx.h"              /*(commxForkExec) */
 #include "cmdarg.h"             /*cmdarg */
+#include "utils.h"
 
 /* socket input processing loop */
   static void
@@ -587,7 +588,8 @@ getPtyMaster (char **line_return)
     goto bsd;
   }
   line = malloc (strlen (temp_line) + 1);
-  if (!line)
+  chk_alloc (line);
+  if (line == NULL)
   {
     close (pty);
     return -1;
@@ -621,7 +623,8 @@ getPtyMaster (char **line_return)
 
 found:
   line = malloc (strlen (name) + 1);
-  if (line)
+  chk_alloc (line);
+  if (line != NULL)
   {
     strcpy (line, name);
     line[5] = 't';
@@ -644,7 +647,6 @@ Warning: could not change ownership of tty -- pty is insecure!\n"), stderr);
     *line_return = line;
     return pty;
   }
-  fputs ("malloc(): error allocating memory -- exiting.", stderr);
   exit (EXIT_FAILURE);
 
 bail:

src/stty.c

@@ -9,7 +9,7 @@
   static void
 sigint (int i)
 {
-  exit (1);
+  _exit (1);
 }
 
 static int pid;