Removed the space between function names and the opening parenthesis.
[mmh] / uip / flist.c
index 17916fb..0f44555 100644 (file)
@@ -137,16 +137,17 @@ main(int argc, char **argv)
        ** If program was invoked with name ending
        ** in `s', then add switch `-all'.
        */
-       if (argv[0][strlen (argv[0]) - 1] == 's')
+       if (argv[0][strlen(argv[0]) - 1] == 's')
                all = TRUE;
 
-       arguments = getarguments (invo_name, argc, argv, 1);
+       arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
        /* allocate the initial space to record the folder names */
        numfolders = 0;
        maxfolders = MAXFOLDERS;
-       foldersToDo = (char **) mh_xmalloc ((size_t) (maxfolders * sizeof(*foldersToDo)));
+       foldersToDo = (char **) mh_xmalloc((size_t)
+                       (maxfolders * sizeof(*foldersToDo)));
 
        /* no sequences yet */
        numsequences = 0;
@@ -162,21 +163,21 @@ main(int argc, char **argv)
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
-                               snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]",
-                                               invo_name);
+                               snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", invo_name);
                                print_help(buf, switches, 1);
                                done(1);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done (1);
+                               done(1);
 
                        case SEQSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
 
                                /* check if too many sequences specified */
                                if (numsequences >= NUMATTRS)
-                                       adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
+                                       adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
                                sequencesToDo[numsequences++] = cp;
                                break;
 
@@ -225,25 +226,24 @@ main(int argc, char **argv)
                        */
                        if (numfolders >= maxfolders) {
                                maxfolders += MAXFOLDERS;
-                               foldersToDo = (char **) mh_xrealloc (foldersToDo,
-                                       (size_t) (maxfolders * sizeof(*foldersToDo)));
+                               foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
                        }
                        if (*cp == '+' || *cp == '@') {
                                foldersToDo[numfolders++] =
-                                       pluspath (cp);
+                                       pluspath(cp);
                        } else
                                foldersToDo[numfolders++] = cp;
                }
        }
 
-       if (!context_find ("path"))
-               free (path ("./", TFOLDER));
+       if (!context_find("path"))
+               free(path("./", TFOLDER));
 
        /* get current folder */
-       strncpy (curfolder, getfolder(1), sizeof(curfolder));
+       strncpy(curfolder, getfolder(1), sizeof(curfolder));
 
        /* get nmh base directory */
-       nmhdir = m_maildir ("");
+       nmhdir = m_maildir("");
 
        /*
        ** If we didn't specify any sequences, we search
@@ -257,16 +257,15 @@ main(int argc, char **argv)
                        char **ap, *dp;
 
                        dp = getcpy(cp);
-                       ap = brkstring (dp, " ", "\n");
+                       ap = brkstring(dp, " ", "\n");
                        for (; ap && *ap; ap++) {
                                if (numsequences >= NUMATTRS)
-                                       adios (NULL, "too many sequences (more than %d) in %s profile entry",
-                                                  NUMATTRS, usequence);
+                                       adios(NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
                                else
                                        sequencesToDo[numsequences++] = *ap;
                        }
                } else {
-                       adios (NULL, "no sequence specified or %s profile entry found", usequence);
+                       adios(NULL, "no sequence specified or %s profile entry found", usequence);
                }
        }
 
@@ -274,7 +273,7 @@ main(int argc, char **argv)
        ScanFolders();
        qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
        PrintFolders();
-       done (0);
+       done(0);
        return 1;
 }
 
@@ -323,14 +322,15 @@ ScanFolders(void)
        /*
         * change directory to base of nmh directory
         */
-       if (chdir (nmhdir) == NOTOK)
-               adios (nmhdir, "unable to change directory to");
+       if (chdir(nmhdir) == NOTOK)
+               adios(nmhdir, "unable to change directory to");
 
        if (numfolders > 0) {
                /* Update context */
-               strncpy (curfolder, foldersToDo[numfolders - 1], sizeof(curfolder));
-               context_replace (pfolder, curfolder);/* update current folder */
-               context_save ();  /* save the context file */
+               strncpy(curfolder, foldersToDo[numfolders - 1],
+                               sizeof(curfolder));
+               context_replace(pfolder, curfolder);/* update current folder */
+               context_save();  /* save the context file */
 
                /*
                ** Scan each given folder.  If -all is given,
@@ -377,8 +377,8 @@ BuildFolderList(char *dirName, int searchdepth)
        ** If base directory, don't add it to the
        ** folder list. We just recurse into it.
        */
-       if (!strcmp (dirName, ".")) {
-               BuildFolderListRecurse (".", &st, 0);
+       if (!strcmp(dirName, ".")) {
+               BuildFolderListRecurse(".", &st, 0);
                return;
        }
 
@@ -387,7 +387,8 @@ BuildFolderList(char *dirName, int searchdepth)
        ** If recursing and directory has subfolders,
        ** then build folder list for subfolders.
        */
-       if (AddFolder(dirName, showzero) && (recurse || searchdepth) && st.st_nlink > 2)
+       if (AddFolder(dirName, showzero) && (recurse || searchdepth) &&
+                       st.st_nlink > 2)
                BuildFolderListRecurse(dirName, &st, searchdepth - 1);
 }
 
@@ -421,7 +422,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
        ** A hack so that we don't see a
        ** leading "./" in folder names.
        */
-       base = strcmp (dirName, ".") ? dirName : dirName + 1;
+       base = strcmp(dirName, ".") ? dirName : dirName + 1;
 
        while (nlinks && (dp = readdir(dir))) {
                if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
@@ -436,7 +437,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
                for (n = dp->d_name; *n && isdigit(*n); n++);
                if (!*n)
                        continue;
-               strncpy (name, base, sizeof(name) - 2);
+               strncpy(name, base, sizeof(name) - 2);
                if (*base)
                        strcat(name, "/");
                strncat(name, dp->d_name, sizeof(name) - strlen(name) - 1);
@@ -445,7 +446,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
                        ** Check if this was really a symbolic link pointing
                        ** to a directory.  If not, then decrement link count.
                        */
-                       if (lstat (name, &st) == -1)
+                       if (lstat(name, &st) == -1)
                                nlinks--;
                        /* Add this folder to the list */
                        if (AddFolder(name, showzero) &&
@@ -471,7 +472,7 @@ AddFolder(char *name, int force)
        struct msgs *mp;
 
        /* Read folder and create message structure */
-       if (!(mp = folder_read (name))) {
+       if (!(mp = folder_read(name))) {
                /* Oops, error occurred.  Record it and continue. */
                AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
                f = &folders[nFolders++];
@@ -491,7 +492,8 @@ AddFolder(char *name, int force)
                /* Now count messages in this sequence */
                nSeq[i] = 0;
                if (mp->nummsg > 0 && seqnum[i] != -1) {
-                       for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++) {
+                       for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg;
+                                       msgnum++) {
                                if (in_sequence(mp, seqnum[i], msgnum))
                                        nSeq[i]++;
                        }
@@ -519,11 +521,12 @@ AddFolder(char *name, int force)
                /* record the sequence information */
                for (i = 0; i < numsequences; i++) {
                        f->nSeq[i] = nSeq[i];
-                       f->private[i] = (seqnum[i] != -1) ? is_seq_private(mp, seqnum[i]) : 0;
+                       f->private[i] = (seqnum[i] != -1) ?
+                                       is_seq_private(mp, seqnum[i]) : 0;
                }
        }
 
-       folder_free (mp);  /* free folder/message structure */
+       folder_free(mp);  /* free folder/message structure */
        return 1;
 }
 
@@ -564,8 +567,9 @@ PrintFolders(void)
 
                for (j = 0; j < numsequences; j++) {
                        /* find maximum width of sequence name */
-                       len = strlen (sequencesToDo[j]);
-                       if ((folders[i].nSeq[j] > 0 || showzero) && (len > maxseqlen))
+                       len = strlen(sequencesToDo[j]);
+                       if ((folders[i].nSeq[j] > 0 || showzero) &&
+                                       (len > maxseqlen))
                                maxseqlen = len;
 
                        /* find the maximum number of messages in sequence */
@@ -584,21 +588,21 @@ PrintFolders(void)
                        if (folders[i].nSeq[j] > 0 || showzero) {
                                /* Add `+' to end of name of current folder */
                                if (strcmp(curfolder, folders[i].name))
-                                       snprintf(tmpname, sizeof(tmpname), "%s", folders[i].name);
+                                       snprintf(tmpname, sizeof(tmpname),
+                                                       "%s", folders[i].name);
                                else
-                                       snprintf(tmpname, sizeof(tmpname), "%s+", folders[i].name);
+                                       snprintf(tmpname, sizeof(tmpname),
+                                                       "%s+",
+                                                       folders[i].name);
 
                                if (folders[i].error) {
-                                       printf("%-*s is unreadable\n", maxfolderlen+1, tmpname);
+                                       printf("%-*s is unreadable\n",
+                                                       maxfolderlen+1,
+                                                       tmpname);
                                        continue;
                                }
 
-                               printf("%-*s has %*d in sequence %-*s%s; out of %*d\n",
-                                          maxfolderlen+1, tmpname,
-                                          num_digits(maxseq), folders[i].nSeq[j],
-                                          maxseqlen, sequencesToDo[j],
-                                          !has_private ? "" : folders[i].private[j] ? " (private)" : "          ",
-                                          num_digits(maxnum), folders[i].nMsgs);
+                               printf("%-*s has %*d in sequence %-*s%s; out of %*d\n", maxfolderlen+1, tmpname, num_digits(maxseq), folders[i].nSeq[j], maxseqlen, sequencesToDo[j], !has_private ? "" : folders[i].private[j] ? " (private)" : "          ", num_digits(maxnum), folders[i].nMsgs);
                        }
                }
        }
@@ -628,10 +632,12 @@ AllocFolders(struct Folder **f, int *nfa, int n)
                return;
        if (*f == NULL) {
                *nfa = 10;
-               *f = (struct Folder *) mh_xmalloc (*nfa * (sizeof(struct Folder)));
+               *f = (struct Folder *) mh_xmalloc(
+                               *nfa * (sizeof(struct Folder)));
        } else {
                *nfa *= 2;
-               *f = (struct Folder *) mh_xrealloc (*f, *nfa * (sizeof(struct Folder)));
+               *f = (struct Folder *) mh_xrealloc(
+                               *f, *nfa * (sizeof(struct Folder)));
        }
 }
 
@@ -657,10 +663,12 @@ AssignPriority(char *name)
                        continue;
                if (ol < bestLen)
                        continue;
-               if (o->name[0] == '*' && !strcmp(o->name + 1, name + (nl - ol + 1))) {
+               if (o->name[0] == '*' && !strcmp(o->name + 1,
+                               name + (nl - ol + 1))) {
                        best = o->priority;
                        bestLen = ol;
-               } else if (o->name[ol - 1] == '*' && strncmp(o->name, name, ol - 1) == 0) {
+               } else if (o->name[ol - 1] == '*' &&
+                               strncmp(o->name, name, ol - 1) == 0) {
                        best = o->priority;
                        bestLen = ol;
                }
@@ -673,17 +681,17 @@ AssignPriority(char *name)
 */
 
 static void
-do_readonly_folders (void)
+do_readonly_folders(void)
 {
        int atrlen;
        char atrcur[BUFSIZ];
        register struct node *np;
 
-       snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
-       atrlen = strlen (atrcur);
+       snprintf(atrcur, sizeof(atrcur), "atr-%s-", current);
+       atrlen = strlen(atrcur);
 
        for (np = m_defs; np; np = np->n_next)
-               if (ssequal (atrcur, np->n_name)
-                               && !ssequal (nmhdir, np->n_name + atrlen))
-                       BuildFolderList (np->n_name + atrlen, 0);
+               if (ssequal(atrcur, np->n_name)
+                               && !ssequal(nmhdir, np->n_name + atrlen))
+                       BuildFolderList(np->n_name + atrlen, 0);
 }