LU-16067 misc: cleanup compiler warnings

[tools/e2fsprogs.git] / lib / ss / help.c

diff --git a/lib/ss/help.c b/lib/ss/help.c
index f956ca8..5204401 100644 (file)
--- a/lib/ss/help.c
+++ b/lib/ss/help.c
@@ -1,15 +1,29 @@
 /*
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
- * For copyright info, see copyright.h.
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose is hereby granted, provided that
+ * the names of M.I.T. and the M.I.T. S.I.P.B. not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  M.I.T. and the
+ * M.I.T. S.I.P.B. make no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without
+ * express or implied warranty.
  */
 
-#ifdef HAS_UNISTD_H
+#include "config.h"
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#else
+extern int errno;
+#endif
+#include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/file.h>
@@ -17,19 +31,14 @@
 /* just for O_* */
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 #include "ss_internal.h"
-#include "copyright.h"
 
-extern int errno;
-
-void ss_help (argc, argv, sci_idx, info_ptr)
-    int argc;
-    char const * const *argv;
-    int sci_idx;
-    pointer info_ptr;
+void ss_help(int argc, char const * const *argv, int sci_idx, pointer info_ptr)
 {
-    char buffer[MAXPATHLEN];
+    char *buffer;
     char const *request_name;
     int code;
     int fd, child;
@@ -47,9 +56,16 @@ void ss_help (argc, argv, sci_idx, info_ptr)
     }
     else if (argc != 2) {
        /* should do something better than this */
+       buffer = malloc(80+2*strlen(request_name));
+       if (!buffer) {
+               ss_perror(sci_idx, 0,
+                         "couldn't allocate memory to print usage message");
+               return;
+       }
        sprintf(buffer, "usage:\n\t%s [topic|command]\nor\t%s\n",
                request_name, request_name);
        ss_perror(sci_idx, 0, buffer);
+       free(buffer);
        return;
     }
     info = ss_info(sci_idx);
@@ -61,46 +77,55 @@ void ss_help (argc, argv, sci_idx, info_ptr)
        ss_perror(sci_idx, SS_ET_NO_INFO_DIR, (char *)NULL);
        return;
     }
-    for (idx = 0; info->info_dirs[idx] != (char *)NULL; idx++) {
+    for (fd = -1, idx = 0; info->info_dirs[idx] != (char *)NULL; idx++) {
+        buffer = malloc(strlen (info->info_dirs[idx]) + 1 +
+                       strlen (argv[1]) + 6);
+       if (!buffer) {
+           ss_perror(sci_idx, 0,
+                     "couldn't allocate memory for help filename");
+           return;
+       }
        (void) strcpy(buffer, info->info_dirs[idx]);
        (void) strcat(buffer, "/");
        (void) strcat(buffer, argv[1]);
        (void) strcat(buffer, ".info");
-       if ((fd = open(&buffer[0], O_RDONLY)) >= 0) goto got_it;
+       fd = open(buffer, O_RDONLY);
+       free(buffer);
+       if (fd >= 0)
+           break;
     }
-    if ((fd = open(&buffer[0], O_RDONLY)) < 0) {
-       char buf[MAXPATHLEN];
-       strcpy(buf, "No info found for ");
+    if (fd < 0) {
+#define MSG "No info found for "
+        char *buf = malloc(strlen (MSG) + strlen (argv[1]) + 1);
+       strcpy(buf, MSG);
        strcat(buf, argv[1]);
        ss_perror(sci_idx, 0, buf);
+       free(buf);
        return;
     }
-got_it:
     switch (child = fork()) {
     case -1:
        ss_perror(sci_idx, errno, "Can't fork for pager");
+       (void) close(fd);
        return;
     case 0:
        (void) dup2(fd, 0); /* put file on stdin */
        ss_page_stdin();
     default:
        (void) close(fd); /* what can we do if it fails? */
-       while (wait(0) != child) {
+       while (wait(NULL) != child) {
            /* do nothing if wrong pid */
        };
     }
 }
 
-#ifndef USE_DIRENT_H
+#ifndef HAVE_DIRENT_H
 #include <sys/dir.h>
 #else
 #include <dirent.h>
 #endif
 
-void ss_add_info_dir(sci_idx, info_dir, code_ptr)
-    int sci_idx;
-    char *info_dir;
-    int *code_ptr;
+void ss_add_info_dir(int sci_idx, char *info_dir, int *code_ptr)
 {
     register ss_data *info;
     DIR *d;
@@ -108,7 +133,7 @@ void ss_add_info_dir(sci_idx, info_dir, code_ptr)
     register char **dirs;
 
     info = ss_info(sci_idx);
-    if (info_dir == NULL && *info_dir) {
+    if (info_dir == NULL || *info_dir == '\0') {
        *code_ptr = SS_ET_NO_INFO_DIR;
        return;
     }
@@ -134,10 +159,7 @@ void ss_add_info_dir(sci_idx, info_dir, code_ptr)
     *code_ptr = 0;
 }
 
-void ss_delete_info_dir(sci_idx, info_dir, code_ptr)
-    int sci_idx;
-    char *info_dir;
-    int *code_ptr;
+void ss_delete_info_dir(int sci_idx, char *info_dir, int *code_ptr)
 {
     register char **i_d;
     register char **info_dirs;