[pkgsrc/trunk]: pkgsrc/security/nfsbug Fix prototypes.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/060513e50055
branches:  trunk
changeset: 648749:060513e50055
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Mar 18 13:21:36 2015 +0000

description:
Fix prototypes.

diffstat:

 security/nfsbug/distinfo         |    4 +-
 security/nfsbug/patches/patch-ab |  378 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 360 insertions(+), 22 deletions(-)

diffs (truncated from 496 to 300 lines):

diff -r a8c9a2eb684a -r 060513e50055 security/nfsbug/distinfo
--- a/security/nfsbug/distinfo  Wed Mar 18 10:28:42 2015 +0000
+++ b/security/nfsbug/distinfo  Wed Mar 18 13:21:36 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/01/03 03:31:54 minskim Exp $
+$NetBSD: distinfo,v 1.9 2015/03/18 13:21:36 joerg Exp $
 
 SHA1 (nfsBugFerret.tgz) = 6b0b2d25fadd3156cf0f8851d72b6d6070dc528c
 RMD160 (nfsBugFerret.tgz) = e238e0a892bb8e46969278687ce6ec1944ae24c8
@@ -7,5 +7,5 @@
 RMD160 (nfsShell.c) = 340454d35e6e67b87255cba7437186639f16cfa5
 Size (nfsShell.c) = 47258 bytes
 SHA1 (patch-aa) = b28b48831632d2ffe8e103589c9fbf5b3e840d02
-SHA1 (patch-ab) = 9848a6b64eb5aa9279f913292795e8bc10fc7799
+SHA1 (patch-ab) = e83664461f9c25e171260990c47f678ba4b6eb33
 SHA1 (patch-ac) = 8beb4759a385252700aabcee9f6cd0d585bf5274
diff -r a8c9a2eb684a -r 060513e50055 security/nfsbug/patches/patch-ab
--- a/security/nfsbug/patches/patch-ab  Wed Mar 18 10:28:42 2015 +0000
+++ b/security/nfsbug/patches/patch-ab  Wed Mar 18 13:21:36 2015 +0000
@@ -1,13 +1,21 @@
-$NetBSD: patch-ab,v 1.3 2007/01/03 03:31:54 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2015/03/18 13:21:36 joerg Exp $
 
---- nfsshell.c.orig    2007-01-02 19:29:27.000000000 -0800
+--- nfsshell.c.orig    2015-03-18 00:18:15.000000000 +0000
 +++ nfsshell.c
 @@ -1,3 +1,4 @@
 +/* URL: http://www.asmodeus.com/archive/Xnix/nfsShell */
  /*
   * Copyright, 1991, 1992, by Leendert van Doorn (leendert%cs.vu.nl@localhost)
   *
-@@ -21,14 +22,21 @@
+@@ -10,6 +11,7 @@
+ /*
+  * nfs - A shell that provides access to NFS file systems
+  */
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+@@ -21,14 +23,47 @@
  #include <sys/ioctl.h>
  #include <sys/socket.h>
  #include <sys/vnode.h>
@@ -23,15 +31,72 @@
  #include "mount.h"
  #include "nfs_prot.h"
  
-+int getline(char *buf, int bufsize, int *argc, char **argv, int argvsize);
-+AUTH * MYauthunix_create_default(uid, gid);
++static void close_nfs(void);
++static void do_handle(int argc, char **argv);
++static void do_setid(int *var, int argc, char **argv);
++static void printfilestatus(char *name);
++static void do_cat(int argc, char **argv);
++static void do_chown(int argc, char **argv);
++static void do_chmod(int argc, char **argv);
++static void do_cd(int argc, char **argv);
++static void do_df(int argc, char **argv);
++static void do_dump(int argc, char **argv);
++static void do_export(int argc, char **argv);
++static void do_get(int argc, char **argv);
++static void do_help(int argc, char **argv);
++static void do_host(int argc, char **argv);
++static void do_ln(int argc, char **argv);
++static void do_ls(int argc, char **argv);
++static void do_mkdir(int argc, char **argv);
++static void do_mknod(int argc, char **argv);
++static void do_mount(int argc, char **argv);
++static void do_mv(int argc, char **argv);
++static void do_put(int argc, char **argv);
++static void do_rm(int argc, char **argv);
++static void do_rmdir(int argc, char **argv);
++static void do_status(int argc, char **argv);
++static void do_umount(int argc, char **argv);
++static void do_umountall(int argc, char **argv);
++int nfsbug_getline(char *buf, int bufsize, int *argc, char **argv, int argvsize);
++static AUTH * MYauthunix_create_default(int uid, int gid);
 +static int determine_transfersize();
 +
 +
  /*
   * Fundamental constants
   */
-@@ -284,8 +292,11 @@ getline(buf, bufsize, argc, argv, argvsi
+@@ -128,13 +163,8 @@ jmp_buf intenv;                   /* where to go in inte
+ 
+ fhstatus *pmap_mnt();
+ 
+-char *malloc();
+-char *calloc();
+-char *realloc();
+ char *strsave();
+-char *strchr();
+ char *nfs_error();
+-char *getenv();
+ void interrupt();
+ 
+ main(argc, argv)
+@@ -164,7 +194,7 @@ main(argc, argv)
+ 
+     /* interpreter's main command loop */
+     if (setjmp(intenv)) putchar('\n');
+-    while (getline(buffer, BUFSIZ, &argcount, argvec, NARGVEC)) {
++    while (nfsbug_getline(buffer, BUFSIZ, &argcount, argvec, NARGVEC)) {
+       if (argcount == 0) continue;
+       if ((cmd = command(argvec[0])) == CMD_QUIT)
+           break;
+@@ -277,15 +307,18 @@ interrupt()
+  * it up into an argument vector.
+  */
+ int
+-getline(buf, bufsize, argc, argv, argvsize)
++nfsbug_getline(buf, bufsize, argc, argv, argvsize)
+     char *buf, **argv;
+     int bufsize, *argc, argvsize;
+ {
      register char *p;
  
      if (interact) printf("nfs> ");
@@ -44,7 +109,26 @@
      *argc = 0;
      for (p = buf; *p == ' ' || *p == '\t'; p++)
        /* skip white spaces */;
-@@ -340,7 +351,7 @@ do_setid(var, argc, argv)
+@@ -320,9 +353,7 @@ command(cmd)
+  * Set remote host and initialize RPC channel
+  * to mount daemon.
+  */
+-do_host(argc, argv)
+-    int argc;
+-    char **argv;
++void do_host(int argc, char **argv)
+ {
+     if (argc != 2)
+       fprintf(stderr, "Usage: host <host>\n");
+@@ -333,23 +364,19 @@ do_host(argc, argv)
+ /*
+  * Set user or group id (updating RPC authentication info)
+  */
+-do_setid(var, argc, argv)
+-    int *var, argc;
+-    char **argv;
++static void do_setid(int *var, int argc, char **argv)
+ {
      *var = argc == 2 ? atoi(argv[1]) : -2;
      if (nfsclient && nfsclient->cl_auth) {
        auth_destroy(nfsclient->cl_auth);
@@ -53,18 +137,175 @@
      }
  }
  
-@@ -509,8 +520,7 @@ do_ls(argc, argv)
+ /*
+  * Change remote working directory
+  */
+-do_cd(argc, argv)
+-    int argc;
+-    char **argv;
++void do_cd(int argc, char **argv)
+ {
+     register char *p;
+     char *component;
+@@ -421,9 +448,7 @@ do_lcd(argc, argv)
+ /*
+  * Display a remote file
+  */
+-do_cat(argc, argv)
+-    int argc;
+-    char **argv;
++void do_cat(int argc, char **argv)
+ {
+     diropargs dargs;
+     diropres *dres;
+@@ -476,9 +501,7 @@ do_cat(argc, argv)
+ /*
+  * List remote directory
+  */
+-do_ls(argc, argv)
+-    int argc;
+-    char **argv;
++void do_ls(int argc, char **argv)
+ {
+     char **table, **ptr, **p;
+     int lflag = 0;
+@@ -509,8 +532,7 @@ do_ls(argc, argv)
  /*
   * Print long listing of a files, much in the way ``ls -l'' does
   */
 -printfilestatus(name)
 -    char *name;
-+printfilestatus(char *name)
++void printfilestatus(char *name)
  {
      diropargs args;
      diropres *res;
-@@ -1160,7 +1170,7 @@ do_handle(argc, argv)
-         return 0;
+@@ -615,9 +637,7 @@ writefiledate(d)
+ /*
+  * Get remote files
+  */
+-do_get(argc, argv)
+-    int argc;
+-    char **argv;
++void do_get(int argc, char **argv)
+ {
+     char **table, **ptr, **p;
+     char answer[512];
+@@ -698,9 +718,7 @@ do_get(argc, argv)
+  * Show file system information
+  */
+ /* ARGUSED */
+-do_df(argc, argv)
+-    int argc;
+-    char **argv;
++void do_df(int argc, char **argv)
+ {
+     statfsres *res;
+ 
+@@ -734,9 +752,7 @@ do_df(argc, argv)
+ /*
+  * Delete a remote file
+  */
+-do_rm(argc, argv)
+-    int argc;
+-    char **argv;
++void do_rm(int argc, char **argv)
+ {
+     diropargs args;
+     nfsstat *res;
+@@ -764,9 +780,7 @@ do_rm(argc, argv)
+ /*
+  * Link a file
+  */
+-do_ln(argc, argv)
+-    int argc;
+-    char **argv;
++void do_ln(int argc, char **argv)
+ {
+     diropargs dargs;
+     linkargs largs;
+@@ -810,9 +824,7 @@ do_ln(argc, argv)
+ /*
+  * Move a file or directory
+  */
+-do_mv(argc, argv)
+-    int argc;
+-    char **argv;
++void do_mv(int argc, char **argv)
+ {
+     renameargs args;
+     nfsstat *res;
+@@ -842,9 +854,7 @@ do_mv(argc, argv)
+ /*
+  * Make remote directory
+  */
+-do_mkdir(argc, argv)
+-    int argc;
+-    char **argv;
++void do_mkdir(int argc, char **argv)
+ {
+     createargs args;
+     diropres *res;
+@@ -882,9 +892,7 @@ do_mkdir(argc, argv)
+ /*
+  * Remove remote directory
+  */
+-do_rmdir(argc, argv)
+-    int argc;
+-    char **argv;
++void do_rmdir(int argc, char **argv)
+ {
+     diropargs args;
+     nfsstat *res;
+@@ -913,9 +921,7 @@ do_rmdir(argc, argv)
+ /*
+  * Change mode of remote file or directory
+  */
+-do_chmod(argc, argv)
+-    int argc;
+-    char **argv;
++void do_chmod(int argc, char **argv)
+ {
+     sattrargs aargs;
+     diropargs dargs;
+@@ -970,9 +976,7 @@ do_chmod(argc, argv)
+ /*
+  * Change owner (and group) of remote file or directory
+  */
+-do_chown(argc, argv)
+-    int argc;
+-    char **argv;
++void do_chown(int argc, char **argv)
+ {
+     sattrargs aargs;
+     diropargs dargs;
+@@ -1030,9 +1034,7 @@ do_chown(argc, argv)
+ /*
+  * Put file from local to remote