Revert the libcrypt/libmd stuff back to how it was. This should not have

[pw-darwin.git] / pw / fileupd.c

diff --git a/pw/fileupd.c b/pw/fileupd.c
index fe46480048d1280bd5b1708eee5253d2a9e25072..a846513dbea3e15050a26aa0c65d08a939b80cf8 100644 (file)
--- a/pw/fileupd.c
+++ b/pw/fileupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: fileupd.c,v 1.5 1997/10/10 06:23:31 charnier Exp $";
+  "$FreeBSD$";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -71,38 +71,44 @@ extendarray(char ***buf, int * buflen, int needed)
 int
 fileupdate(char const * filename, mode_t fmode, char const * newline, char const * prefix, int pfxlen, int updmode)
 {
 int
 fileupdate(char const * filename, mode_t fmode, char const * newline, char const * prefix, int pfxlen, int updmode)
 {

-       int             rc = 0;
+       int     rc = 0;

 
        if (pfxlen <= 1)
 
        if (pfxlen <= 1)

-               errno = EINVAL;
+               rc = EINVAL;

        else {
        else {

-               int             infd = open(filename, O_RDWR | O_CREAT, fmode);
+               int    infd = open(filename, O_RDWR | O_CREAT, fmode);

 
 

-               if (infd != -1) {
-                       FILE           *infp = fdopen(infd, "r+");
+               if (infd == -1)
+                       rc = errno;
+               else {
+                       FILE   *infp = fdopen(infd, "r+");

 
 

-                       if (infp == NULL)
+                       if (infp == NULL) {
+                               rc = errno;             /* Assumes fopen(3) sets errno from open(2) */

                                close(infd);
                                close(infd);

-                       else {
-                               int             outfd;
-                               char            file[MAXPATHLEN];
+                       } else {
+                               int       outfd;
+                               char      file[MAXPATHLEN];

 
                                strcpy(file, filename);
                                strcat(file, ".new");
                                outfd = open(file, O_RDWR | O_CREAT | O_TRUNC | O_EXLOCK, fmode);
 
                                strcpy(file, filename);
                                strcat(file, ".new");
                                outfd = open(file, O_RDWR | O_CREAT | O_TRUNC | O_EXLOCK, fmode);

-                               if (outfd != -1) {
-                                       FILE           *outfp = fdopen(outfd, "w+");
+                               if (outfd == -1)
+                                       rc = errno;
+                               else {
+                                       FILE    *outfp = fdopen(outfd, "w+");

 
 

-                                       if (outfp == NULL)
+                                       if (outfp == NULL) {
+                                               rc = errno;

                                                close(outfd);
                                                close(outfd);

-                                       else {
-                                               int             updated = UPD_CREATE;
+                                       } else {
+                                               int   updated = UPD_CREATE;

                                                int             linesize = PWBUFSZ;
                                                int             linesize = PWBUFSZ;

-                                               char           *line = malloc(linesize);
+                                               char  *line = malloc(linesize);

 
                                        nextline:
                                                while (fgets(line, linesize, infp) != NULL) {
 
                                        nextline:
                                                while (fgets(line, linesize, infp) != NULL) {

-                                                       char           *p = strchr(line, '\n');
+                                                       char  *p = strchr(line, '\n');

 
                                                        while ((p = strchr(line, '\n')) == NULL) {
                                                                int     l;
 
                                                        while ((p = strchr(line, '\n')) == NULL) {
                                                                int     l;


@@ -143,7 +149,11 @@ fileupdate(char const * filename, mode_t fmode, char const * newline, char const
                                                 * then error
                                                 */
                                                if (updmode != updated)
                                                 * then error
                                                 */
                                                if (updmode != updated)

-                                                       errno = (updmode == UPD_CREATE) ? EEXIST : ENOENT;
+                                                       /* -1 return means:
+                                                        * update,delete=no user entry
+                                                        * create=entry exists
+                                                        */
+                                                       rc = -1;

                                                else {
 
                                                        /*
                                                else {
 
                                                        /*


@@ -155,9 +165,9 @@ fileupdate(char const * filename, mode_t fmode, char const * newline, char const
                                                        /*
                                                         * Flush the file and check for the result
                                                         */
                                                        /*
                                                         * Flush the file and check for the result
                                                         */

-                                                       rc = fflush(outfp) != EOF;
-                                                       if (rc) {
-
+                                                       if (fflush(outfp) == EOF)
+                                                               rc = errno;     /* Failed to update */
+                                                       else {

                                                                /*
                                                                 * Copy data back into the
                                                                 * original file and truncate
                                                                /*
                                                                 * Copy data back into the
                                                                 * original file and truncate


@@ -168,23 +178,16 @@ fileupdate(char const * filename, mode_t fmode, char const * newline, char const
                                                                        fputs(line, infp);
 
                                                                /*
                                                                        fputs(line, infp);
 
                                                                /*

-                                                                 * If there was a problem with copying
-                                                                 * we will just rename 'file.new' 
-                                                                 * to 'file'.
+                                                                * If there was a problem with copying
+                                                                * we will just rename 'file.new' 
+                                                                * to 'file'.

                                                                 * This is a gross hack, but we may have
                                                                 * corrupted the original file
                                                                 * Unfortunately, it will lose the inode
                                                                 * This is a gross hack, but we may have
                                                                 * corrupted the original file
                                                                 * Unfortunately, it will lose the inode

-                                                                 * and hence the lock.
-                                                                 *
-                                                                 * The implications of this is that this invocation of pw 
-                                                                 * won't have the file locked and concurrent copies
-                                                                 * of pw, vipw etc could clobber what this one is doing.
-                                                                 *
-                                                                 * It should probably just return an error instead
-                                                                 * of going on like nothing is wrong.
+                                                                * and hence the lock.

                                                                 */
                                                                if (fflush(infp) == EOF || ferror(infp))
                                                                 */
                                                                if (fflush(infp) == EOF || ferror(infp))

-                                                                       rc = rename(file, filename) == 0;
+                                                                       rename(file, filename);

                                                                else
                                                                        ftruncate(infd, ftell(infp));
                                                        }
                                                                else
                                                                        ftruncate(infd, ftell(infp));
                                                        }