nfsshell/gcc.patch

   1 diff -Nur nfs.orig/Makefile nfs/Makefile
   2 --- nfs.orig/Makefile   1998-05-20 06:37:23.000000000 +1000
   3 +++ nfs/Makefile        2010-08-05 23:42:20.794623280 +1000
   4 @@ -22,10 +22,10 @@
   5  #
   6
   7  # uncomment the following 4 lines for Solaris 2.x
   8 -CC             = gcc
   9 -CFLAGS         = -DSYSV -DREADLINE -I/usr/local/include
  10 -LIBS           = -lsocket -L/usr/ucblib -R/usr/ucblib -lrpcsoc -lnsl \
  11 -                 -L/usr/local/lib -lreadline -lhistory -ltermlib
  12 +#CC            = gcc
  13 +#CFLAGS                = -DSYSV -DREADLINE -I/usr/local/include
  14 +#LIBS          = -lsocket -L/usr/ucblib -R/usr/ucblib -lrpcsoc -lnsl \
  15 +#                -L/usr/local/lib -lreadline -lhistory -ltermlib
  16
  17  # uncomment the following 3 lines for AIX
  18  #CC            = gcc
  19 @@ -33,9 +33,9 @@
  20  #LIBS          =
  21
  22  # uncomment the following 3 lines for linux (tested on 2.0.33/redhat 5)
  23 -#CC            = gcc
  24 -#CFLAGS                = -DREADLINE -I/usr/local/include
  25 -#LIBS          = -L/usr/local/lib -lreadline -lhistory -lncurses
  26 +CC             = gcc
  27 +CFLAGS         = -DREADLINE
  28 +LIBS           = -lreadline -lhistory
  29
  30  RPCGEN         = rpcgen
  31  RGFLAGS                = -C
  32 diff -Nur nfs.orig/nfs.c nfs/nfs.c
  33 --- nfs.orig/nfs.c      1998-05-20 06:36:10.000000000 +1000
  34 +++ nfs/nfs.c   2010-08-05 23:42:09.724623249 +1000
  35 @@ -189,7 +189,7 @@
  36
  37  void interrupt(int);
  38  int command(char *);
  39 -int getline(char *, int, int *, char **, int);
  40 +int nfs_getline(char *, int, int *, char **, int);
  41  void do_host(int, char **);
  42  void do_setuid(int, char **);
  43  void do_setgid(int, char **);
  44 @@ -266,7 +266,7 @@
  45
  46      /* interpreter's main command loop */
  47      if (setjmp(intenv)) putchar('\n');
  48 -    while (getline(buffer, BUFSIZ, &argcount, argvec, NARGVEC)) {
  49 +    while (nfs_getline(buffer, BUFSIZ, &argcount, argvec, NARGVEC)) {
  50         if (argcount == 0) continue;
  51         if ((cmd = command(argvec[0])) == CMD_QUIT)
  52             break;
  53 @@ -377,7 +377,7 @@
  54   * it up into an argument vector.
  55   */
  56  int
  57 -getline(char *buf, int bufsize, int *argc, char **argv, int argvsize)
  58 +nfs_getline(char *buf, int bufsize, int *argc, char **argv, int argvsize)
  59  {
  60      register char *p;
  61