Source-Changes-HG archive

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

[src/trunk]: src/libexec/httpd remove trailing whitespace



details:   https://anonhg.NetBSD.org/src/rev/c19c97934a93
branches:  trunk
changeset: 790448:c19c97934a93
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sat Oct 12 07:49:40 2013 +0000

description:
remove trailing whitespace

diffstat:

 libexec/httpd/Makefile    |   6 +++---
 libexec/httpd/bozohttpd.c |  24 ++++++++++++------------
 libexec/httpd/bozohttpd.h |   6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (155 lines):

diff -r ecc96e59b99a -r c19c97934a93 libexec/httpd/Makefile
--- a/libexec/httpd/Makefile    Fri Oct 11 16:30:31 2013 +0000
+++ b/libexec/httpd/Makefile    Sat Oct 12 07:49:40 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2013/07/11 08:51:09 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2013/10/12 07:49:40 mbalmer Exp $
 #
 #      $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -48,7 +48,7 @@
 # Build release things.
 #
 NROFF?=                nroff
-  
+
 PREHTMLFROB=   sed \
                    -e 's/&/\&amp;/' \
                    -e 's/</\&lt;/' \
@@ -64,7 +64,7 @@
 
 bozohttpd.8.html: bozohttpd.8
        $(PREHTMLFROB) $> | $(NROFF) -mdoc2html | $(HTMLFROB) > $@
-  
+
 bozohttpd.8.txt: bozohttpd.8
        $(NROFF) -mdoc -Tascii $> | $(TXTFROB) > $@
 
diff -r ecc96e59b99a -r c19c97934a93 libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Fri Oct 11 16:30:31 2013 +0000
+++ b/libexec/httpd/bozohttpd.c Sat Oct 12 07:49:40 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.c,v 1.41 2013/07/11 07:46:37 mrg Exp $       */
+/*     $NetBSD: bozohttpd.c,v 1.42 2013/10/12 07:49:40 mbalmer Exp $   */
 
 /*     $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $      */
 
@@ -99,7 +99,7 @@
  *     - 14.9: we aren't a cache.
  *
  *     - 14.15: content-md5 would be nice...
- *     
+ *
  *     - 14.24/14.26/14.27: be nice to support this...
  *
  *     - 14.44: not sure about this Vary: header.  ignore it for now.
@@ -867,7 +867,7 @@
                buflen = len * 3 + 1;
                buf = bozorealloc(httpd, buf, buflen);
        }
-       
+
        if (url == NULL) {
                buf[0] = 0;
                return buf;
@@ -958,7 +958,7 @@
        char portbuf[20];
        const char *hostname = BOZOHOST(httpd, request);
        int query = 0;
-       
+
        if (url == NULL) {
                if (asprintf(&urlbuf, "/%s/", request->hr_file) < 0)
                        bozo_err(httpd, 1, "asprintf");
@@ -981,7 +981,7 @@
                bozo_warn(httpd, "redirecting %s%s%s", hostname, portbuf, url);
        debug((httpd, DEBUG_FAT, "redirecting %s", url));
        bozo_printf(httpd, "%s 301 Document Moved\r\n", request->hr_proto);
-       if (request->hr_proto != httpd->consts.http_09) 
+       if (request->hr_proto != httpd->consts.http_09)
                bozo_print_header(request, NULL, "text/html", NULL);
        if (request->hr_proto != httpd->consts.http_09) {
                bozo_printf(httpd, "Location: http://";);
@@ -1230,7 +1230,7 @@
                                        "percent hack was %2f (/)");
                        goto copy_rest;
                }
-                       
+
                buf[0] = *++s;
                buf[1] = *++s;
                buf[2] = '\0';
@@ -1267,7 +1267,7 @@
  *     - punt if it doesn't start with /
  *     - check httpd->untrustedref / referrer
  *     - look for "http://myname/"; and deal with it.
- *     - maybe call bozo_process_cgi() 
+ *     - maybe call bozo_process_cgi()
  *     - check for ~user and call bozo_user_transform() if so
  *     - if the length > 1, check for trailing slash.  if so,
  *       add the index.html file
@@ -1307,8 +1307,8 @@
 
 #define TOP_PAGE(x)    (strcmp((x), "/") == 0 || \
                         strcmp((x) + 1, httpd->index_html) == 0 || \
-                        strcmp((x) + 1, "favicon.ico") == 0) 
-               
+                        strcmp((x) + 1, "favicon.ico") == 0)
+
                debug((httpd, DEBUG_EXPLODING, "checking httpd->untrustedref"));
                /*
                 * first check that this path isn't allowed via .bzdirect file,
@@ -1403,7 +1403,7 @@
         */
 
        /*
-        * stop traversing outside our domain 
+        * stop traversing outside our domain
         *
         * XXX true security only comes from our parent using chroot(2)
         * before execve(2)'ing us.  or our own built in chroot(2) support.
@@ -1527,7 +1527,7 @@
                        (void)bozo_http_error(httpd, 403, request,
                                                "no permission to open file");
                else if (errno == ENOENT) {
-                       if (!bozo_dir_index(request, file, isindex)) 
+                       if (!bozo_dir_index(request, file, isindex))
                                (void)bozo_http_error(httpd, 404, request,
                                                        "no file");
                } else
@@ -1690,7 +1690,7 @@
 {
        va_list ap;
        int savederrno;
-       
+
        /* only log if the level is low enough */
        if (httpd->debug < level)
                return;
diff -r ecc96e59b99a -r c19c97934a93 libexec/httpd/bozohttpd.h
--- a/libexec/httpd/bozohttpd.h Fri Oct 11 16:30:31 2013 +0000
+++ b/libexec/httpd/bozohttpd.h Sat Oct 12 07:49:40 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.h,v 1.28 2013/09/04 22:59:50 pooka Exp $     */
+/*     $NetBSD: bozohttpd.h,v 1.29 2013/10/12 07:49:40 mbalmer Exp $   */
 
 /*     $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $       */
 
@@ -121,7 +121,7 @@
                                           to hr_httpd->virthostname) */
        char    *hr_file;
        char    *hr_oldfile;    /* if we added an index_html */
-       char    *hr_query;  
+       char    *hr_query;
        const char *hr_proto;
        const char *hr_content_type;
        const char *hr_content_length;
@@ -184,7 +184,7 @@
 void   debug__(bozohttpd_t *, int, const char *, ...) BOZO_PRINTFLIKE(3, 4);
 #define debug(x)       debug__ x
 #else
-#define        debug(x)        
+#define        debug(x)
 #endif /* NO_DEBUG */
 
 void   bozo_warn(bozohttpd_t *, const char *, ...)



Home | Main Index | Thread Index | Old Index