Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/man man: remove trailing whitespace



details:   https://anonhg.NetBSD.org/src/rev/108a65bcddbb
branches:  trunk
changeset: 363387:108a65bcddbb
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Mar 08 23:09:36 2022 +0000

description:
man: remove trailing whitespace

No binary change.

diffstat:

 usr.bin/man/man.c     |  72 +++++++++++++++++++++++++-------------------------
 usr.bin/man/manconf.h |   4 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diffs (270 lines):

diff -r 24d0fa1fca84 -r 108a65bcddbb usr.bin/man/man.c
--- a/usr.bin/man/man.c Tue Mar 08 23:05:32 2022 +0000
+++ b/usr.bin/man/man.c Tue Mar 08 23:09:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: man.c,v 1.70 2022/03/08 23:05:32 rillig Exp $  */
+/*     $NetBSD: man.c,v 1.71 2022/03/08 23:09:36 rillig Exp $  */
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)man.c      8.17 (Berkeley) 1/31/95";
 #else
-__RCSID("$NetBSD: man.c,v 1.70 2022/03/08 23:05:32 rillig Exp $");
+__RCSID("$NetBSD: man.c,v 1.71 2022/03/08 23:09:36 rillig Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@
 } instype;
 
 /*
- * manstate: structure collecting the current global state so we can 
+ * manstate: structure collecting the current global state so we can
  * easily identify it and pass it to helper functions in one arg.
  */
 struct manstate {
@@ -90,13 +90,13 @@
        char *sectionname;      /* -s: limit search to a given man section */
        int where;              /* -w: just show paths of all matching files */
        int getpath;    /* -p: print the path of directories containing man pages */
-               
+
        /* important tags from the config file */
        TAG *defaultpath;       /* _default: default MANPATH */
        TAG *subdirs;           /* _subdir: default subdir search list */
        TAG *suffixlist;        /* _suffix: for files that can be cat()'d */
        TAG *buildlist;         /* _build: for files that must be built */
-       
+
        /* tags for internal use */
        TAG *intmp;             /* _intmp: tmp files we must cleanup */
        TAG *missinglist;       /* _missing: pages we couldn't find */
@@ -246,8 +246,8 @@
                        argc--;
                }
 
-       } 
-       
+       }
+
        if (m.manpath == NULL)
                m.manpath = getenv("MANPATH"); /* note: -M overrides getenv */
 
@@ -261,7 +261,7 @@
        m.defaultpath = gettag("_default", 1);
        m.subdirs = gettag("_subdir", 1);
        m.suffixlist = gettag("_suffix", 1);
-       m.buildlist = gettag("_build", 1); 
+       m.buildlist = gettag("_build", 1);
        /* internal use */
        m.mymanpath = gettag("_new_path", 1);
        m.missinglist = gettag("_missing", 1);
@@ -276,7 +276,7 @@
         * as config() will ensure that any additional entries will match
         * the first one.)
         */
-       abs_section = (m.section != NULL && 
+       abs_section = (m.section != NULL &&
                !TAILQ_EMPTY(&m.section->entrylist) &&
                        *(TAILQ_FIRST(&m.section->entrylist)->s) == '/');
 
@@ -297,7 +297,7 @@
 
        /*
         * [2] section can now only be non-null if the user asked for
-        *     a section and that section's elements did not have 
+        *     a section and that section's elements did not have
         *     absolute paths.  in this case we use the section's
         *     elements to override _subdir from the config file.
         *
@@ -312,10 +312,10 @@
         *     go with the default.   in either case we need to append
         *     the subdir and machine spec to each element of the path.
         *
-        *     for absolute section paths that come from the config file, 
-        *     we only append the subdir spec if the path ends in 
-        *     a '/' --- elements that do not end in '/' are assumed to 
-        *     not have subdirectories.  this is mainly for backward compat, 
+        *     for absolute section paths that come from the config file,
+        *     we only append the subdir spec if the path ends in
+        *     a '/' --- elements that do not end in '/' are assumed to
+        *     not have subdirectories.  this is mainly for backward compat,
         *     but it allows non-subdir configs like:
         *      sect3       /usr/share/man/{old/,}cat3
         *      doc         /usr/{pkg,share}/doc/{sendmail/op,sendmail/intro}
@@ -352,9 +352,9 @@
        }
 
        /*
-        * [4] finally, prepend the "-m" m.addpath to mymanpath if it 
+        * [4] finally, prepend the "-m" m.addpath to mymanpath if it
         *     was specified.   subdirs and machine are always applied to
-        *     m.addpath. 
+        *     m.addpath.
         */
        if (m.addpath) {
 
@@ -373,7 +373,7 @@
                printmanpath(&m);
                exit(cleanup());
        }
-               
+
        /*
         * now m.mymanpath is complete!
         */
@@ -385,8 +385,8 @@
 #endif
 
        /*
-        * start searching for matching files and format them if necessary.   
-        * setup an interrupt handler so that we can ensure that temporary 
+        * start searching for matching files and format them if necessary.
+        * setup an interrupt handler so that we can ensure that temporary
         * files go away.
         */
        (void)signal(SIGINT, onsig);
@@ -432,7 +432,7 @@
                }
                exit(cleanup());
        }
-               
+
        /*
         * normal case - we display things in a single command, so
         * build a list of things to display.  first compute total
@@ -605,7 +605,7 @@
 
                /* literal file only yields one match */
                cnt = pg->gl_pathc - pg->gl_matchc;
- 
+
                if (manual_find_literalfile(mp, &pg->gl_pathv[cnt])) {
                        anyfound = 1;
                } else {
@@ -628,7 +628,7 @@
        /* For each man directory in mymanpath ... */
        TAILQ_FOREACH(mdir, &mp->mymanpath->entrylist, q) {
 
-               /* 
+               /*
                 * use glob(3) to look in the filesystem for matching files.
                 * match any suffix here, as we will check that later.
                 */
@@ -647,8 +647,8 @@
                        continue;
 
                /*
-                * start going through the matches glob(3) just found and 
-                * use m.pathsearch (if present) to filter out pages we 
+                * start going through the matches glob(3) just found and
+                * use m.pathsearch (if present) to filter out pages we
                 * don't want.  then verify the suffix is valid, and build
                 * the page if we have a _build suffix.
                 */
@@ -737,7 +737,7 @@
        return userfmt;
 }
 
-/* 
+/*
  * build_page --
  *     Build a man page for display.
  */
@@ -758,7 +758,7 @@
        }
 
        /*
-        * Historically man chdir'd to the root of the man tree. 
+        * Historically man chdir'd to the root of the man tree.
         * This was used in man pages that contained relative ".so"
         * directives (including other man pages for command aliases etc.)
         * It even went one step farther, by examining the first line
@@ -766,12 +766,12 @@
         * make hard(?) links to the cat'ted man pages for space savings.
         * (We don't do that here, but we could).
         */
- 
+
        /* copy and find the end */
        for (b = buf, p = *pathp; (*b++ = *p++) != '\0';)
                continue;
- 
-       /* 
+
+       /*
         * skip the last two path components, page name and man[n] ...
         * (e.g. buf will be "/usr/share/man" and p will be "man1/man.1")
         * we also save a pointer to our current directory so that we
@@ -803,7 +803,7 @@
        if ((tmpdir = getenv("TMPDIR")) == NULL)
                tmpdir = _PATH_TMP;
        tmpdirlen = strlen(tmpdir);
-       (void)snprintf(tpath, sizeof (tpath), "%s%s%s", tmpdir, 
+       (void)snprintf(tpath, sizeof (tpath), "%s%s%s", tmpdir,
            (tmpdirlen > 0 && tmpdir[tmpdirlen-1] == '/') ? "" : "/", TMPFILE);
        if ((fd = mkstemp(tpath)) == -1) {
                warn("%s", tpath);
@@ -960,7 +960,7 @@
        err(EXIT_FAILURE, "Cannot execute `%s'", name);
 }
 
-/* 
+/*
  * onsig --
  *     If signaled, delete the temporary files.
  */
@@ -988,7 +988,7 @@
        int rval;
 
        rval = EXIT_SUCCESS;
-       /* 
+       /*
         * note that _missing and _intmp were created by main(), so
         * gettag() cannot return NULL here.
         */
@@ -1040,8 +1040,8 @@
        (void)fprintf(stderr, "Usage: %s [-acw|-h] [-C cfg] [-M path] "
            "[-m path] [-S srch] [[-s] sect] name ...\n", getprogname());
        (void)fprintf(stderr, "Usage: %s [-C file] -f command ...\n", getprogname());
-       (void)fprintf(stderr, 
-           "Usage: %s [-C file] -k keyword ...\n", 
+       (void)fprintf(stderr,
+           "Usage: %s [-C file] -k keyword ...\n",
            getprogname());
        (void)fprintf(stderr, "Usage: %s -p\n", getprogname());
        exit(EXIT_FAILURE);
@@ -1059,11 +1059,11 @@
        glob_t pg;
        struct stat sb;
        TAG *path = m->mymanpath;
-       
+
        /* the tail queue is empty if no _default tag is defined in * man.conf */
        if (TAILQ_EMPTY(&path->entrylist))
                errx(EXIT_FAILURE, "Empty manpath");
-               
+
        TAILQ_FOREACH(epath, &path->entrylist, q) {
                if (glob(epath->s, GLOB_BRACE | GLOB_NOSORT, NULL, &pg) != 0)
                        err(EXIT_FAILURE, "glob failed");
diff -r 24d0fa1fca84 -r 108a65bcddbb usr.bin/man/manconf.h
--- a/usr.bin/man/manconf.h     Tue Mar 08 23:05:32 2022 +0000
+++ b/usr.bin/man/manconf.h     Tue Mar 08 23:09:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: manconf.h,v 1.3 2006/04/10 14:39:06 chuck Exp $        */
+/*     $NetBSD: manconf.h,v 1.4 2022/03/08 23:09:36 rillig Exp $       */
 
 /*-
  * Copyright (c) 1993
@@ -33,7 +33,7 @@
  */
 
 /*
- * manconf.h: common data structures and APIs shared across all programs 
+ * manconf.h: common data structures and APIs shared across all programs
  * that access man.conf (currently: apropos, catman, makewhatis, man, and
  * whatis).
  */



Home | Main Index | Thread Index | Old Index