username_tab_completion: rewritten using getpwent

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@503 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 92b723bd60ec4183fb9b997a08881ea062fb1d93..95f244af3b6c657811b3b5dea8321c79a672a9d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ General
          discovered by David Sobon).
   username_tab_completion()
        - Optimization and removal of useless vars (Rocco).
+       - Rewritten using getpwent (suggested by Rocco).
   real_dir_from_tilde()
        - Rewritten using getpwent (suggested by Adam, much optimized by Rocco).
 - global.c:

diff --git a/files.c b/files.c
index 554429e6a64e38cf9a44168e9c8aa261122c88de..5c14760d42a89733af7fd3389a6679cb2d144d86 100644 (file)
--- a/files.c
+++ b/files.c
@@ -676,78 +676,37 @@ int append_slash_if_dir(char *buf, int *lastWasTab, int *place)
 
 char **username_tab_completion(char *buf, int *num_matches)
 {
-    char **matches = (char **) NULL, *line = NULL, *lineptr;
+    char **matches = (char **) NULL;
     char *matchline = NULL;
-
-    int fd, i = 0, status = 1;
-    char byte[1];
-
-    if ((fd = open("/etc/passwd", O_RDONLY)) == -1) {
-       return NULL;
-    }
+    struct passwd *userdata;
 
     *num_matches = 0;
     matches = nmalloc(BUFSIZ * sizeof(char *));
 
     strcat(buf, "*");
 
-    do {
-       i = 0;
-       line = nrealloc(line, 1);
-       while ((status = read(fd, byte, 1)) == 1 && byte[0] != '\n') {
+    while ((userdata = getpwent()) != NULL) {
 
-           line[i] = byte[0];
-           i++;
-           line = nrealloc(line, i + 1);
-       }
-
-       if (i == 0)
+       if (userdata == NULL)
            break;
 
-       line[i] = 0;
-       lineptr = strtok(line, ":");
-
-       if (check_wildcard_match(line, &buf[1]) == TRUE) {
+       if (check_wildcard_match(userdata->pw_name, &buf[1]) == TRUE) {
 
            /* Cool, found a match.  Add it to the list
             * This makes a lot more sense to me (Chris) this way...
             */
 
-           matchline = nmalloc(strlen(line) + 2);
-           sprintf(matchline, "~%s", line);
-
-           for (i = 0; i <= 4 && lineptr != NULL; i++)
-               lineptr = strtok(NULL, ":");
-
-           if (lineptr != NULL) {
-
-               /* /etc/passwd entry has the required number of fields */
-
-               matches[*num_matches] = matchline;
-               ++*num_matches;
-
-               /* If there's no more room, bail out */
-               if (*num_matches == BUFSIZ)
-                   break;
-           }
-           else {
-
-               /* /etc/passwd entry is missing at least one field */
+           matchline = nmalloc(strlen(userdata->pw_name) + 2);
+           sprintf(matchline, "~%s", userdata->pw_name);
+           matches[*num_matches] = matchline;
+           ++*num_matches;
 
-               free(matchline);
-           }
+           /* If there's no more room, bail out */
+           if (*num_matches == BUFSIZ)
+               break;
        }
-
-
-    } while (status == 1);
-
-    free(line);
-
-    close(fd);
-
-#ifdef DEBUG
-    fprintf(stderr, "\nin username_tab_completion\n");
-#endif
+    }
+    endpwent();
 
     return (matches);
 }