[hackers] [quark] Refactor request() || FRIGN

From: <git_AT_suckless.org>
Date: Mon, 28 Jul 2014 15:32:20 +0200

commit 6d5bedd72a6086a6aac346b22bb57ab4aaf1b6ab
Author: FRIGN <dev_AT_frign.de>
Date: Mon Jul 28 15:30:56 2014 +0200

    Refactor request()
    
    Unite duplicate code in the getreqentry() function, making error-checking
    much easier, and, more importantly, drastically increase the readability.

diff --git a/quark.c b/quark.c
index 5e8e43e..917b3d4 100644
--- a/quark.c
+++ b/quark.c
_AT_@ -58,6 +58,7 @@ static void responsedir(void);
 static void responsedirdata(DIR *d);
 static void responsefile(void);
 static void responsefiledata(int fd, off_t size);
+static int getreqentry(char *name, char *target, size_t targetlen, char *breakchars);
 static int request(void);
 static void serve(int fd);
 static void sighandler(int sig);
_AT_@ -398,44 +399,48 @@ response(void) {
 }
 
 int
+getreqentry(char *name, char *target, size_t targetlen, char *breakchars) {
+ char *p, *res;
+
+ if((res = strstr(reqbuf, name))) {
+ for(res = res + strlen(name); *res && (*res == ' ' || *res == ' '); ++res);
+ if(!*res)
+ return 1;
+ for(p = res; *p && !strchr(breakchars, *p); ++p);
+ if(!*p)
+ return 1;
+ if((size_t)(p - res) > targetlen)
+ return 1;
+ memcpy(target, res, p - res);
+ target[p - res] = 0;
+ return 0;
+ }
+ return -1;
+}
+
+int
 request(void) {
         char *p, *res;
         int r;
         size_t offset = 0;
 
- do { /* MAXBUFLEN byte of reqbuf is emergency 0 terminator */
+ /* read request into reqbuf */
+ for( ; r > 0 && offset < MAXBUFLEN && (!strstr(reqbuf, "
") || !strstr(reqbuf, "
")); ) {
                 if((r = read(req.fd, reqbuf + offset, MAXBUFLEN - offset)) == -1) {
                         logerrmsg("read: %s
", strerror(errno));
                         return -1;
                 }
                 offset += r;
- reqbuf[offset] = 0;
- }
- while(r > 0 && offset < MAXBUFLEN && (!strstr(reqbuf, "
") || !strstr(reqbuf, "
")));
- if((res = strstr(reqbuf, "Host:"))) {
- for(res = res + 5; *res && (*res == ' ' || *res == ' '); res++);
- if(!*res)
- goto invalid_request;
- for(p = res; *p && *p != ' ' && *p != ' ' && *p != ' ' && *p != '
'; p++);
- if(!*p)
- goto invalid_request;
- if(p - res > sizeof reqhost)
- goto invalid_request;
- memcpy(reqhost, res, p - res);
- reqhost[p - res] = 0;
- }
- if((res = strstr(reqbuf, "If-Modified-Since:"))) {
- for(res = res + 19; *res && (*res == ' ' || *res == ' '); res++);
- if(!*res)
- goto invalid_request;
- for(p = res; *p && *p != ' ' && *p != '
'; p++);
- if(!*p)
- goto invalid_request;
- if(p - res > sizeof reqmod)
- goto invalid_request;
- memcpy(reqmod, res, p - res);
- reqmod[p - res] = 0;
+ reqbuf[offset] = 0; /* MAXBUFLEN byte of reqbuf is emergency 0 terminator */
         }
+
+ /* extract host and mod */
+ if (getreqentry("Host:", reqhost, LENGTH(reqhost), "
") != 0)
+ goto invalid_request;
+ if (getreqentry("If-Modified-Since:", reqmod, LENGTH(reqmod), "
") == 1)
+ goto invalid_request;
+
+ /* extract method */
         for(p = reqbuf; *p && *p != ' ' && *p != '
'; p++);
         if(*p == ' ' || *p == '
') {
                 *p = 0;
_AT_@ -446,9 +451,10 @@ request(void) {
                         req.type = HEAD;
                 else
                         goto invalid_request;
- }
- else
+ } else {
                 goto invalid_request;
+ }
+
         /* determine path */
         for(res = reqbuf + req.type; *res && *(res + 1) == '/'; res++); /* strip '/' */
         if(!*res)
Received on Mon Jul 28 2014 - 15:32:20 CEST