add Berkeley specific headers

SCCS-vsn: usr.bin/ftp/Makefile 5.5
SCCS-vsn: usr.bin/ftp/cmds.c 5.7
SCCS-vsn: usr.bin/ftp/cmdtab.c 5.5
SCCS-vsn: usr.bin/ftp/domacro.c 1.4
SCCS-vsn: usr.bin/ftp/ftp.c 5.17
SCCS-vsn: usr.bin/ftp/ftp_var.h 5.4
SCCS-vsn: usr.bin/ftp/main.c 5.10
SCCS-vsn: usr.bin/ftp/ruserpass.c 1.4

diff --git a/usr/src/usr.bin/ftp/Makefile b/usr/src/usr.bin/ftp/Makefile
index ce6c2b5..d28a2cb 100644 (file)
--- a/usr/src/usr.bin/ftp/Makefile
+++ b/usr/src/usr.bin/ftp/Makefile
@@ -1,9 +1,15 @@
 #
 #

-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    5.4     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that this notice is preserved and that due credit is given
+# to the University of California at Berkeley. The name of the University
+# may not be used to endorse or promote products derived from this
+# software without specific prior written permission. This software
+# is provided ``as is'' without express or implied warranty.
+#
+#      @(#)Makefile    5.5 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a

diff --git a/usr/src/usr.bin/ftp/cmds.c b/usr/src/usr.bin/ftp/cmds.c
index a895662..a6f1fa7 100644 (file)
--- a/usr/src/usr.bin/ftp/cmds.c
+++ b/usr/src/usr.bin/ftp/cmds.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmds.c     5.6 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)cmds.c     5.7 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * FTP User Program -- Command Routines.
 
 /*
  * FTP User Program -- Command Routines.

diff --git a/usr/src/usr.bin/ftp/cmdtab.c b/usr/src/usr.bin/ftp/cmdtab.c
index 56236a3..e215b41 100644 (file)
--- a/usr/src/usr.bin/ftp/cmdtab.c
+++ b/usr/src/usr.bin/ftp/cmdtab.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmdtab.c   5.4 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)cmdtab.c   5.5 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ftp_var.h"
 
 
 #include "ftp_var.h"
 

diff --git a/usr/src/usr.bin/ftp/domacro.c b/usr/src/usr.bin/ftp/domacro.c
index 9ca3e51..c93e9b5 100644 (file)
--- a/usr/src/usr.bin/ftp/domacro.c
+++ b/usr/src/usr.bin/ftp/domacro.c
@@ -1,13 +1,18 @@
-

 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)domacro.c  1.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)domacro.c  1.4 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ftp_var.h"
 
 
 #include "ftp_var.h"
 

diff --git a/usr/src/usr.bin/ftp/ftp.c b/usr/src/usr.bin/ftp/ftp.c
index a039957..0a027d6 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ftp.c      5.16 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)ftp.c      5.17 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ftp_var.h"
 
 
 #include "ftp_var.h"
 

diff --git a/usr/src/usr.bin/ftp/ftp_var.h b/usr/src/usr.bin/ftp/ftp_var.h
index 1ab6583..3142252 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp_var.h
+++ b/usr/src/usr.bin/ftp/ftp_var.h
@@ -1,9 +1,15 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)ftp_var.h   5.3 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *     @(#)ftp_var.h   5.4 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/usr.bin/ftp/main.c b/usr/src/usr.bin/ftp/main.c
index 0e0808e..db020c3 100644 (file)
--- a/usr/src/usr.bin/ftp/main.c
+++ b/usr/src/usr.bin/ftp/main.c
@@ -1,18 +1,24 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1985 Regents of the University of California.\n\
  All rights reserved.\n";
  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1985 Regents of the University of California.\n\
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.9 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)main.c     5.10 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * FTP User Program -- Command Interface.
 
 /*
  * FTP User Program -- Command Interface.

diff --git a/usr/src/usr.bin/ftp/ruserpass.c b/usr/src/usr.bin/ftp/ruserpass.c
index cea3b83..c756921 100644 (file)
--- a/usr/src/usr.bin/ftp/ruserpass.c
+++ b/usr/src/usr.bin/ftp/ruserpass.c
@@ -1,13 +1,18 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ruserpass.c        1.3 (Berkeley) %G%";
-#endif not lint
-
+static char sccsid[] = "@(#)ruserpass.c        1.4 (Berkeley) %G%";
+#endif /* not lint */

 
 struct macel {
        char mac_name[9];       /* macro name */
 
 struct macel {
        char mac_name[9];       /* macro name */