diff -rc2 tar-1.05.orig/Makefile tar-1.05/Makefile *** tar-1.05.orig/Makefile Thu Jan 26 19:36:42 1989 --- tar-1.05/Makefile Mon Mar 13 21:52:06 1989 *************** *** 15,37 **** # Berserkeley version ! DEFS = -DBSD42 ! LOCAL_SRC = getdate.y rtape_lib.c ! LOCAL_OBJ = getdate.$O rtape_lib.$O ! LDFLAGS = ! LIBS = ! LINT = lint ! LINTFLAGS = -abchx ! DEF_AR_FILE = \"/dev/rmt8\" ! DEFBLOCKING = 20 ! O = o ! ! # USG version ! #DEFS = -DUSG ! #LOCAL_SRC = getdate.y rtape_lib.c ! #LOCAL_OBJ = getdate.$O rtape_lib.$O #LDFLAGS = ! #LIBS = -lndir -lPW #LINT = lint ! #LINTFLAGS = -p #DEF_AR_FILE = \"/dev/rmt8\" #DEFBLOCKING = 20 --- 15,25 ---- # Berserkeley version ! #DEFS = -DBSD42 ! #LOCAL_SRC = getdate.y rtape_lib.c ! #LOCAL_OBJ = getdate.$O rtape_lib.$O #LDFLAGS = ! #LIBS = #LINT = lint ! #LINTFLAGS = -abchx #DEF_AR_FILE = \"/dev/rmt8\" #DEFBLOCKING = 20 *************** *** 38,41 **** --- 26,43 ---- #O = o + # USG version, add -DSVR3 for SVR3 (uses dirent.h, otherwise ndir.h) + CC = gcc + DEFS = -DUSG + LOCAL_SRC = getdate.y rtape_lib.c + LOCAL_OBJ = getdate.$O rtape_lib.$O + LDFLAGS = + #LIBS = -lndir -lPW + LIBS = -lndir -lizard + LINT = lint + LINTFLAGS = -p + DEF_AR_FILE = \"/dev/rct\" + DEFBLOCKING = 20 + O = o + # UniSoft's Uniplus SVR2 with NFS #DEFS = -DUSG -DUNIPLUS -DNFS -DSVR2 *************** *** 129,135 **** -DDEFBLOCKING=$(DEFBLOCKING) # next line for Debugging ! COPTS = -g # next line for Production ! #COPTS = -O # Add things here like getopt, readdir, etc that aren't in your --- 131,137 ---- -DDEFBLOCKING=$(DEFBLOCKING) # next line for Debugging ! #COPTS = -g # next line for Production ! COPTS = -O # Add things here like getopt, readdir, etc that aren't in your *************** *** 139,143 **** # Destination directory and installation program for make install ! DESTDIR = /usr/local INSTALL = cp RM = rm -f --- 141,145 ---- # Destination directory and installation program for make install ! DESTDIR = /usr/gbin INSTALL = cp RM = rm -f diff -rc2 tar-1.05.orig/create.c tar-1.05/create.c *** tar-1.05.orig/create.c Thu Mar 2 19:57:47 1989 --- tar-1.05/create.c Mon Mar 13 21:28:31 1989 *************** *** 47,51 **** #include #else ! #ifdef USG #include "dirent.h" #define direct dirent --- 47,51 ---- #include #else ! #ifdef SVR3 #include "dirent.h" #define direct dirent diff -rc2 tar-1.05.orig/port.c tar-1.05/port.c *** tar-1.05.orig/port.c Thu Mar 2 20:04:26 1989 --- tar-1.05/port.c Mon Mar 13 22:15:07 1989 *************** *** 64,68 **** #undef WANT_DUMB_GETDATE/* WANT_DUMB_GETDATE --> getdate() */ #undef WANT_VALLOC /* WANT_VALLOC --> valloc() */ ! #undef WANT_MKDIR /* WANT_MKDIR --> mkdir() rmdir() */ #undef WANT_STRING /* WANT_STRING --> index() bcopy() bzero() bcmp() */ #undef WANT_BZERO /* WANT_BZERO --> bzero() bcmp() execlp() */ --- 64,68 ---- #undef WANT_DUMB_GETDATE/* WANT_DUMB_GETDATE --> getdate() */ #undef WANT_VALLOC /* WANT_VALLOC --> valloc() */ ! #define WANT_MKDIR /* WANT_MKDIR --> mkdir() rmdir() */ #undef WANT_STRING /* WANT_STRING --> index() bcopy() bzero() bcmp() */ #undef WANT_BZERO /* WANT_BZERO --> bzero() bcmp() execlp() */ *************** *** 74,78 **** #undef WANT_GETOPT /* WANT_GETOPT --> getopt() optind optarg */ #undef WANT_STRSTR /* WANT_STRSTR --> strstr() */ ! #undef WANT_FTRUNCATE /* WANT_FRTUNCATE --> frtruncate() */ /* Define only ONE of these four . . . */ --- 74,78 ---- #undef WANT_GETOPT /* WANT_GETOPT --> getopt() optind optarg */ #undef WANT_STRSTR /* WANT_STRSTR --> strstr() */ ! #define WANT_FTRUNCATE /* WANT_FRTUNCATE --> frtruncate() */ /* Define only ONE of these four . . . */ *************** *** 81,85 **** #undef VARARGS_MSG /* Define this one if you have varargs.h and vfprintf() */ ! #undef STDC_MSG /* Define this one if you are using ANSI C and and have vfprintf() */ #undef LOSING_MSG /* Define this one if you don't have any of the --- 81,85 ---- #undef VARARGS_MSG /* Define this one if you have varargs.h and vfprintf() */ ! #define STDC_MSG /* Define this one if you are using ANSI C and and have vfprintf() */ #undef LOSING_MSG /* Define this one if you don't have any of the *************** *** 86,90 **** --- 86,92 ---- above */ #ifdef USG + #ifdef BRAINDAMAGE #define WANT_STRING + #endif #define WANT_VALLOC #endif *************** *** 101,105 **** #define WANT_VALLOC #else ! #define DOPRNT_MSG #define WANT_UTILS #define WANT_CK_PIPE --- 103,107 ---- #define WANT_VALLOC #else ! /*#define DOPRNT_MSG*/ #define WANT_UTILS #define WANT_CK_PIPE *************** *** 1610,1614 **** --- 1612,1621 ---- fprintf(stderr,": "); errno=save_e; + #ifdef notdef + /* Excuse me ??? */ perror((char *)0); + #else + perror(""); + #endif } #endif diff -rc2 tar-1.05.orig/rtape_lib.c tar-1.05/rtape_lib.c *** tar-1.05.orig/rtape_lib.c Thu Mar 2 20:05:25 1989 --- tar-1.05/rtape_lib.c Mon Mar 13 21:49:11 1989 *************** *** 73,77 **** */ ! #define RMTIOCTL 1 /* #define USE_REXEC 1 /* rexec code courtesy of Dan Kegel, srs!dan */ --- 73,77 ---- */ ! /*#define RMTIOCTL 1*/ /* #define USE_REXEC 1 /* rexec code courtesy of Dan Kegel, srs!dan */ *************** *** 384,387 **** --- 384,389 ---- execl("/usr/bin/remsh", "remsh", system, "-l", login, "/etc/rmt", (char *) 0); + execl("/usr/bin/rsh", "rsh", system, "-l", login, + "/etc/rmt", (char *) 0); } else *************** *** 390,393 **** --- 392,397 ---- "/etc/rmt", (char *) 0); execl("/usr/bin/remsh", "remsh", system, + "/etc/rmt", (char *) 0); + execl("/usr/bin/rsh", "rsh", system, "/etc/rmt", (char *) 0); } diff -rc2 tar-1.05.orig/tar.c tar-1.05/tar.c *** tar-1.05.orig/tar.c Mon Feb 6 21:50:17 1989 --- tar-1.05/tar.c Mon Mar 13 21:39:44 1989 *************** *** 42,46 **** #include #else ! #ifdef USG #include #define direct dirent --- 42,46 ---- #include #else ! #ifdef SVR3 #include #define direct dirent diff -rc2 tar-1.05.orig/tar.h tar-1.05/tar.h *** tar-1.05.orig/tar.h Fri Jan 27 19:43:10 1989 --- tar-1.05/tar.h Mon Mar 13 21:40:07 1989 *************** *** 38,41 **** --- 38,44 ---- #endif + #ifdef USG + typedef int size_t; + #endif /* * Header block on tape. Only in tar-1.05.orig: tar.texinfo