summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@NetBSD.org>1994-11-17 07:39:34 +0000
committerjtc <jtc@NetBSD.org>1994-11-17 07:39:34 +0000
commit88d0435bc75edc99c6b01d0b57e4fc3bd67dbe01 (patch)
treec5407fe8a55ab710b69f1c2539d1e321c2ae331d
parenta8bfd3d17acdf360bcfa394c375f8a39cfc31df4 (diff)
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS Id convention.
-rw-r--r--usr.bin/uudecode/Makefile4
-rw-r--r--usr.bin/uudecode/uudecode.c23
-rw-r--r--usr.bin/uuencode/Makefile4
-rw-r--r--usr.bin/uuencode/uuencode.111
-rw-r--r--usr.bin/uuencode/uuencode.c21
-rw-r--r--usr.bin/uuencode/uuencode.format.516
6 files changed, 50 insertions, 29 deletions
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 311e8510d83..2a65b994d6b 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,5 +1,5 @@
-# from: @(#)Makefile 5.1 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.2 1993/07/30 22:30:54 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1994/11/17 07:39:34 jtc Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= uudecode
NOMAN= noman
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 29370f20e4f..1e83b07ed57 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,6 +1,8 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+/* $NetBSD: uudecode.c,v 1.5 1994/11/17 07:39:35 jtc Exp $ */
+
+/*-
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,9 +33,16 @@
* SUCH DAMAGE.
*/
+char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+ The Regents of the University of California. All rights reserved.\n";
+#endif /* not lint */
+
#ifndef lint
-/*static char sccsid[] = "from: @(#)uudecode.c 5.10 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: uudecode.c,v 1.4 1993/11/09 01:46:38 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
+#endif
+static char rcsid[] = "$NetBSD: uudecode.c,v 1.5 1994/11/17 07:39:35 jtc Exp $";
#endif /* not lint */
/*
@@ -48,6 +57,7 @@ static char rcsid[] = "$Id: uudecode.c,v 1.4 1993/11/09 01:46:38 jtc Exp $";
#include <errno.h>
#include <sys/param.h>
#include <sys/stat.h>
+
#include <pwd.h>
#include <unistd.h>
@@ -55,11 +65,10 @@ static int decode();
static void usage();
char *filename;
-/* ARGSUSED */
int
main(argc, argv)
int argc;
- char **argv;
+ char *argv[];
{
int rval;
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index e836ba9fc78..e2d14bd03ba 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,5 +1,5 @@
-# from: @(#)Makefile 5.1 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.2 1993/07/30 22:30:45 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1994/11/17 07:39:41 jtc Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= uuencode
MAN1= uuencode.0
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 69b532bb408..63a0c5d5cc1 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\" $NetBSD: uuencode.1,v 1.4 1994/11/17 07:39:42 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1990, 1993
+.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" from: @(#)uuencode.1 6.9 (Berkeley) 4/23/91
-.\" $Id: uuencode.1,v 1.3 1993/08/27 22:25:56 jtc Exp $
+.\" @(#)uuencode.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd April 23, 1991
+.Dd June 6, 1993
.Dt UUENCODE 1
.Os BSD 4
.Sh NAME
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 85760ab5b3f..bacac9f17df 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,6 +1,8 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+/* $NetBSD: uuencode.c,v 1.6 1994/11/17 07:39:43 jtc Exp $ */
+
+/*-
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,9 +33,16 @@
* SUCH DAMAGE.
*/
+char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+ The Regents of the University of California. All rights reserved.\n";
+#endif /* not lint */
+
#ifndef lint
-/*static char sccsid[] = "from: @(#)uuencode.c 5.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: uuencode.c,v 1.5 1993/11/09 01:47:00 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
+#endif
+static char rcsid[] = "$NetBSD: uuencode.c,v 1.6 1994/11/17 07:39:43 jtc Exp $";
#endif /* not lint */
/*
@@ -56,7 +65,7 @@ static __dead void usage();
int
main(argc, argv)
int argc;
- char **argv;
+ char *argv[];
{
struct stat sb;
int mode;
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index c6d434b6bb7..556918471b4 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" $NetBSD: uuencode.format.5,v 1.3 1994/11/17 07:39:45 jtc Exp $
+.\"
+.\" Copyright (c) 1989, 1991, 1993
+.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -29,12 +31,11 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" from: @(#)uuencode.format.5 6.4 (Berkeley) 5/10/91
-.\" $Id: uuencode.format.5,v 1.2 1993/08/01 07:26:49 mycroft Exp $
+.\" @(#)uuencode.format.5 8.2 (Berkeley) 1/12/94
.\"
-.Dd May 10, 1991
+.Dd January 12, 1994
.Dt UUENCODE 5
-.Os BSD 4.0
+.Os BSD 4
.Sh NAME
.Nm uuencode
.Nd format of an encoded uuencode file
@@ -55,6 +56,7 @@ look like a header.
The header line is distinguished by having the first
6 characters
.Dq begin\ \&
+(note the trailing space).
The word
.Em begin
is followed by a mode (in octal),
@@ -96,7 +98,7 @@ on a line by itself.
.Xr mail 1
.Sh HISTORY
The
-.Nm
+.Nm uuencode
file format appeared in
.Bx 4.0 .
.\" It was named uuencode.5 prior to 4.3