Changeset 2490 for trunk

Timestamp:

Dec 12, 2005, 5:30:33 AM (20 years ago)

Author:

bird

Message:

We cannot rename open files.

File:

• trunk/baselayout/src/pwd_mkdb/pwd_mkdb.c (modified) (9 diffs)

trunk/baselayout/src/pwd_mkdb/pwd_mkdb.c

@@ -178 +178 @@
          * This lock is necessary when someone runs pwd_mkdb manually, directly
          * on master.passwd, to handle the case where a user might try to
-         * change his password while pwd_mkdb is running. 
+         * change his password while pwd_mkdb is running.
          */
         for (;;) {
@@ -225 +225 @@
 
                 /*
-                 * Do some trouble to check if we should store this users 
-                 * uid. Don't use getpwnam/getpwuid as that interferes 
+                 * Do some trouble to check if we should store this users
+                 * uid. Don't use getpwnam/getpwuid as that interferes
                  * with NIS.
                  */
@@ -322 +322 @@
         /* In order to transition this file into a machine-independent
          * form, we have to change the format of entries.  However, since
-         * older binaries will still expect the old MD format entries, we 
+         * older binaries will still expect the old MD format entries, we
          * create those as usual and use versioned tags for the new entries.
          */
@@ -345 +345 @@
         key.data = (u_char *)tbuf;
         for (cnt = 1; scan(fp, &pwd); ++cnt) {
-                if (!is_comment && 
+                if (!is_comment &&
                     (pwd.pw_name[0] == '+' || pwd.pw_name[0] == '-'))
                         yp_enabled = 1;
@@ -354 +354 @@
                         memmove(p, &store, sizeof(store)); \
                         p += sizeof(store);
-                if (!is_comment && 
+                if (!is_comment &&
                     (!username || (strcmp(username, pwd.pw_name) == 0))) {
                         pw_change = pwd.pw_change;
@@ -613 +613 @@
          */
         (void)snprintf(buf, sizeof(buf), "%s/%s", prefix, _MASTERPASSWD);
+#ifdef __EMX__ /* unsafe, but we cannot rename open files. */
+        if (fclose(fp) == EOF)
+                error("close fp");
+#endif
         mv(pname, buf);
 
+#ifndef __EMX__
         /*
          * Close locked password file after rename()
@@ -620 +625 @@
         if (fclose(fp) == EOF)
                 error("close fp");
+#endif
 
         exit(0);
@@ -651 +657 @@
         *p = '\0';
 
-        /* 
+        /*
          * Ignore comments: ^[ \t]*#
          */
@@ -672 +678 @@
 }
 
-void                    
-cp(from, to, mode)              
+void
+cp(from, to, mode)
         char *from, *to;
-        mode_t mode;    
-{               
+        mode_t mode;
+{
         static char buf[MAXBSIZE];
         int from_fd, rcount, to_fd, wcount;