BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / chpass / pw_copy.c

diff --git a/usr/src/usr.bin/chpass/pw_copy.c b/usr/src/usr.bin/chpass/pw_copy.c
index 2ebd73c..9b7ab90 100644 (file)
--- a/usr/src/usr.bin/chpass/pw_copy.c
+++ b/usr/src/usr.bin/chpass/pw_copy.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pw_copy.c  5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)pw_copy.c  5.3 (Berkeley) 5/2/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -18,7 +44,7 @@ static char sccsid[] = "@(#)pw_copy.c 5.2 (Berkeley) %G%";
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-extern char *tempname;
+extern char *progname, *tempname;

 
 pw_copy(ffd, tfd, pw)
        int ffd, tfd;
 
 pw_copy(ffd, tfd, pw)
        int ffd, tfd;


@@ -36,23 +62,27 @@ pw_copy(ffd, tfd, pw)
 
        for (done = 0; fgets(buf, sizeof(buf), from);) {
                if (!index(buf, '\n')) {
 
        for (done = 0; fgets(buf, sizeof(buf), from);) {
                if (!index(buf, '\n')) {

-                       (void)fprintf(stderr, "chpass: %s: line too long\n",
-                           _PATH_MASTERPASSWD);
-                       pw_error((char *)NULL, 0, 1);
+                       (void)fprintf(stderr, "%s: %s: line too long\n",
+                           progname, _PATH_MASTERPASSWD);
+                       pw_error(NULL, 0, 1);

                }
                if (done) {
                        (void)fprintf(to, "%s", buf);
                }
                if (done) {
                        (void)fprintf(to, "%s", buf);

+                       if (ferror(to))
+                               goto err;

                        continue;
                }
                if (!(p = index(buf, ':'))) {
                        continue;
                }
                if (!(p = index(buf, ':'))) {

-                       (void)fprintf(stderr, "chpass: %s: corrupted entry\n",
-                           _PATH_MASTERPASSWD);
-                       pw_error((char *)NULL, 0, 1);
+                       (void)fprintf(stderr, "%s: %s: corrupted entry\n",
+                           progname, _PATH_MASTERPASSWD);
+                       pw_error(NULL, 0, 1);

                }
                *p = '\0';
                if (strcmp(buf, pw->pw_name)) {
                        *p = ':';
                        (void)fprintf(to, "%s", buf);
                }
                *p = '\0';
                if (strcmp(buf, pw->pw_name)) {
                        *p = ':';
                        (void)fprintf(to, "%s", buf);

+                       if (ferror(to))
+                               goto err;

                        continue;
                }
                (void)fprintf(to, "%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n",
                        continue;
                }
                (void)fprintf(to, "%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n",


@@ -60,11 +90,16 @@ pw_copy(ffd, tfd, pw)
                    pw->pw_class, pw->pw_change, pw->pw_expire, pw->pw_gecos,
                    pw->pw_dir, pw->pw_shell);
                done = 1;
                    pw->pw_class, pw->pw_change, pw->pw_expire, pw->pw_gecos,
                    pw->pw_dir, pw->pw_shell);
                done = 1;

+               if (ferror(to))
+                       goto err;

        }
        if (!done)
                (void)fprintf(to, "%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n",
                    pw->pw_name, pw->pw_passwd, pw->pw_uid, pw->pw_gid,
                    pw->pw_class, pw->pw_change, pw->pw_expire, pw->pw_gecos,
                    pw->pw_dir, pw->pw_shell);
        }
        if (!done)
                (void)fprintf(to, "%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n",
                    pw->pw_name, pw->pw_passwd, pw->pw_uid, pw->pw_gid,
                    pw->pw_class, pw->pw_change, pw->pw_expire, pw->pw_gecos,
                    pw->pw_dir, pw->pw_shell);

+
+       if (ferror(to))
+err:           pw_error(NULL, 1, 1);

        (void)fclose(to);
 }
        (void)fclose(to);
 }