Changes in uspace/app/websrv/websrv.c [3e6a98c5:6bb169b5] in mainline

File:

• uspace/app/websrv/websrv.c (modified) (14 diffs)

uspace/app/websrv/websrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
  */
 
-#include <stdbool.h>
+#include <bool.h>
 #include <errno.h>
-#include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -42 +41 @@
 #include <stdlib.h>
 #include <fcntl.h>
-#include <task.h>
 
 #include <net/in.h>
@@ -73 +71 @@
 
 static char fbuf[BUFFER_SIZE];
-
-static bool verbose = false;
 
 /** Responses to send to client. */
@@ -191 +187 @@
         size_t response_size = str_size(msg);
         
-        if (verbose)
-            fprintf(stderr, "Sending response\n");
-        
+        fprintf(stderr, "Sending response\n");
         ssize_t rc = send(conn_sd, (void *) msg, response_size, 0);
         if (rc < 0) {
@@ -257 +251 @@
         }
         
-        if (verbose)
-                fprintf(stderr, "Request: %s", lbuf);
+        fprintf(stderr, "Request: %s", lbuf);
         
         if (str_lcmp(lbuf, "GET ", 4) != 0) {
@@ -273 +266 @@
         
         *end_uri = '\0';
-        if (verbose)
-                fprintf(stderr, "Requested URI: %s\n", uri);
+        fprintf(stderr, "Requested URI: %s\n", uri);
         
         if (!uri_is_valid(uri)) {
@@ -295 +287 @@
             "\n"
             "-h | --help\n"
-            "\tShow this application help.\n"
-            "-v | --verbose\n"
-            "\tVerbose mode\n");
+            "\tShow this application help.\n");
 }
 
@@ -316 +306 @@
                 
                 port = (uint16_t) value;
-                break;
-        case 'v':
-                verbose = true;
                 break;
         /* Long options with double dash */
@@ -331 +318 @@
                         
                         port = (uint16_t) value;
-                } else if (str_cmp(argv[*index] +2, "verbose") == 0) {
-                        verbose = true;
                 } else {
                         usage();
@@ -373 +358 @@
         }
         
-        printf("%s: HelenOS web server\n", NAME);
-
-        if (verbose)
-                fprintf(stderr, "Creating socket\n");
+        fprintf(stderr, "Creating socket\n");
         
         int listen_sd = socket(PF_INET, SOCK_STREAM, 0);
@@ -398 +380 @@
         }
         
-        fprintf(stderr, "%s: Listening for connections at port %" PRIu16 "\n",
-            NAME, port);
-
-        task_retval(0);
-
+        fprintf(stderr, "Listening for connections at port %" PRIu16 "\n",
+            port);
         while (true) {
                 struct sockaddr_in raddr;
@@ -414 +393 @@
                 }
                 
-                if (verbose) {
-                        fprintf(stderr, "Connection accepted (sd=%d), "
-                            "waiting for request\n", conn_sd);
-                }
+                fprintf(stderr, "Connection accepted (sd=%d), "
+                    "waiting for request\n", conn_sd);
                 
                 rbuf_out = 0;
@@ -435 +412 @@
                 }
                 
-                if (verbose)
-                        fprintf(stderr, "Connection closed\n");
+                fprintf(stderr, "Connection closed\n");
         }