[src/trunk]: src/distrib/utils/ssh - WARNSfy

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b72761daab28
branches:  trunk
changeset: 765119:b72761daab28
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu May 19 22:12:35 2011 +0000

description:
- WARNSfy
- KNF, ANSIfy, misc cosmetics

note: this is small shell, not secure shell.

diffstat:

 distrib/utils/ssh/Makefile |    3 +-
 distrib/utils/ssh/ssh.c    |  146 ++++++++++++++++++++------------------------
 2 files changed, 69 insertions(+), 80 deletions(-)

diffs (truncated from 416 to 300 lines):

diff -r f635505ca28a -r b72761daab28 distrib/utils/ssh/Makefile
--- a/distrib/utils/ssh/Makefile        Thu May 19 21:40:11 2011 +0000
+++ b/distrib/utils/ssh/Makefile        Thu May 19 22:12:35 2011 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/12/12 00:05:10 tv Exp $
+# $NetBSD: Makefile,v 1.8 2011/05/19 22:12:35 tsutsui Exp $
 # Small Shell (i.e. for boot media)
 
+WARNS?=                4
 PROG=          ssh
 NOMAN=         # defined
 
diff -r f635505ca28a -r b72761daab28 distrib/utils/ssh/ssh.c
--- a/distrib/utils/ssh/ssh.c   Thu May 19 21:40:11 2011 +0000
+++ b/distrib/utils/ssh/ssh.c   Thu May 19 22:12:35 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh.c,v 1.3 2009/10/21 23:12:09 snj Exp $      */
+/*     $NetBSD: ssh.c,v 1.4 2011/05/19 22:12:35 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -61,7 +61,7 @@
 char cur_path[MAXPATH] = "PATH=/bin:/usr/bin";
 
 char rc_name[] = ".sshrc";
-char *prompt = "ssh: ";
+const char *prompt = "ssh: ";
 
 int eflag;     /* exit on cmd failure */
 int iflag;     /* interactive mode (catch interrupts) */
@@ -69,7 +69,7 @@
 int xflag;     /* execution trace */
 
 /* Command file: name, line number, arg count, arg vector */
-char *cf_name;
+const char *cf_name;
 int cf_line;
 int cf_argc;
 char **cf_argv;
@@ -79,16 +79,23 @@
 
 jmp_buf next_cmd;
 
-void catchsig __P((int sig));
-void child_newfd __P((int setfd, char *file, int otype));
-int find_in_path __P((char *cmd, char *filebuf));
-void print_termsig __P((FILE *fp, int cstat));
-int runfile __P((FILE *fp));
+int main(int, char *[]);
+void catchsig(int sig);
+void child_newfd(int setfd, char *file, int otype);
+int find_in_path(char *cmd, char *filebuf);
+void print_termsig(FILE *fp, int cstat);
+int runfile(FILE *fp);
+
+int cmd_eval(int, char *[]);
+int cmd_cd(int, char *[]);
+int cmd_exit(int, char *[]);
+int cmd_help(int, char *[]);
+int cmd_path(int, char *[]);
+int cmd_run(int, char *[]);
 
 
-main(argc, argv)
-       int argc;
-       char **argv;
+int
+main(int argc, char *argv[])
 {
        struct sigaction sa;
        FILE *cfp;              /* command file ptr */
@@ -116,7 +123,7 @@
        }
        if (error) {
                fprintf(stderr, "usage:  ssh [-eisx] [cmd_file [...]]\n");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
        cf_argc = argc - optind;
        cf_argv = &argv[optind];
@@ -145,7 +152,7 @@
                cfp = fopen(cf_name, "r");
                if (cfp == NULL) {
                        perror(cf_name);
-                       exit(1);
+                       exit(EXIT_FAILURE);
                }
                error = runfile(cfp);
                fclose(cfp);
@@ -174,13 +181,13 @@
                }
        }
        error = runfile(stdin);
-       exit (error);
+       exit(error);
 }
 
 void
-catchsig(sig)
-       int sig;
+catchsig(int sig)
 {
+
        longjmp(next_cmd, sig);
 }
 
@@ -189,8 +196,7 @@
  * Returns exit status.
  */
 int
-runfile(cfp)
-       FILE *cfp;
+runfile(FILE *cfp)
 {
        char ibuf[MAXLINE];
        char *argv[MAXARGS];
@@ -269,7 +275,7 @@
                        break;
        }
        /* return status of last command */
-       return (exitcode);
+       return exitcode;
 }
 
 
@@ -279,9 +285,9 @@
  ****************************************************************/
 
 struct cmd {
-       char *name;
-       int (*func)();
-       char *help;
+       const char *name;
+       int (*func)(int, char *[]);
+       const char *help;
 };
 struct cmd cmd_table[];
 
@@ -291,9 +297,7 @@
  * Returns exit status.
  */
 int
-cmd_eval(argc, argv)
-       int argc;
-       char **argv;
+cmd_eval(int argc, char *argv[])
 {
        struct cmd *cp;
 
@@ -305,7 +309,7 @@
                if (!strcmp(cp->name, argv[0])) {
                        /* Pass only args to builtin. */
                        --argc; argv++;
-                       return (cp->func(argc, argv));
+                       return cp->func(argc, argv);
                }
        }
 
@@ -313,7 +317,7 @@
         * If no matching builtin, let "run ..."
         * have a chance to try an external.
         */
-       return (cmd_run(argc, argv));
+       return cmd_run(argc, argv);
 }
 
 /*****************************************************************
@@ -323,15 +327,12 @@
  *  All return an exit status.
  ****************************************************************/
 
-char help_cd[] = "cd [dir]";
+const char help_cd[] = "cd [dir]";
 
 int
-cmd_cd(argc, argv)
-       int argc;
-       char **argv;
+cmd_cd(int argc, char *argv[])
 {
-       char *dir;
-       int err;
+       const char *dir;
 
        if (argc > 0)
                dir = argv[0];
@@ -342,17 +343,15 @@
        }
        if (chdir(dir)) {
                perror(dir);
-               return (1);
+               return 1;
        }
-       return(0);
+       return 0;
 }
 
-char help_exit[] = "exit [n]";
+const char help_exit[] = "exit [n]";
 
 int
-cmd_exit(argc, argv)
-       int argc;
-       char **argv;
+cmd_exit(int argc, char **argv)
 {
        int val = 0;
 
@@ -361,12 +360,10 @@
        exit(val);
 }
 
-char help_help[] = "help [command]";
+const char help_help[] = "help [command]";
 
 int
-cmd_help(argc, argv)
-       int argc;
-       char **argv;
+cmd_help(int argc, char *argv[])
 {
        struct cmd *cp;
 
@@ -374,7 +371,7 @@
                for (cp = cmd_table; cp->name; cp++) {
                        if (!strcmp(cp->name, argv[0])) {
                                printf("usage:  %s\n", cp->help);
-                               return (0);
+                               return 0;
                        }
                }
                printf("%s: no such command\n", argv[0]);
@@ -385,27 +382,24 @@
                printf(" %s", cp->name);
        }
        printf("\nFor specific usage:  help [command]\n");
-       return (0);
+       return 0;
 }
 
-char help_path[] = "path [dir1:dir2:...]";
+const char help_path[] = "path [dir1:dir2:...]";
 
 int
-cmd_path(argc, argv)
-       int argc;
-       char **argv;
+cmd_path(int argc, char *argv[])
 {
-       int i;
 
        if (argc <= 0) {
                printf("%s\n", cur_path);
-               return(0);
+               return 0;
        }
 
        strncpy(cur_path+5, argv[0], MAXPATH-6);
        putenv(cur_path);
 
-       return (0);
+       return 0;
 }
 
 /*****************************************************************
@@ -415,17 +409,15 @@
  *  (or zero for a background job)
  ****************************************************************/
 
-char help_run[] = "\
+const char help_run[] = "\
 run [-bg] [-i ifile] [-o ofile] [-e efile] program [args...]\n\
 or simply:  program [args...]";
 
 int
-cmd_run(argc, argv)
-       int argc;
-       char **argv;
+cmd_run(int argc, char *argv[])
 {
        struct sigaction sa;
-       int pid, err, cstat, fd;
+       int pid, err, cstat;
        char file[MAXPATHLEN];
        int background;
        char *opt, *ifile, *ofile, *efile;
@@ -458,7 +450,7 @@
                        goto shift;
                default:
                        fprintf(stderr, "run %s: bad option\n", opt);
-                       return (1);
+                       return 1;
                shift:
                        --argc; argv++;
                }
@@ -467,7 +459,7 @@
        if (argc <= 0) {
                fprintf(stderr, "%s:%d run: missing command\n",
                                cf_name, cf_line);
-               return (1);