commit all the code!

[detour.git] / pulser.c

diff --git a/pulser.c b/pulser.c
index fc48c22..370d1ff 100644 (file)
--- a/pulser.c
+++ b/pulser.c
@@ -1,55 +1,4 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <jh.h>
-#include <unistd.h>
-#include <time.h>
-#include <assert.h>
-
-time_t real_seconds(void) {
-  struct timespec t;
-  int s = clock_gettime(CLOCK_REALTIME, &t);
-  assert(s==0);
-  return t.tv_sec;
-}
-
-/* Subtract the `struct timeval' values X and Y,
-   storing the result in RESULT.
-   Return 1 if the difference is negative, otherwise 0. */
-int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y) {
-  /* Perform the carry for the later subtraction by updating y. */
-  if (x->tv_usec < y->tv_usec) {
-    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
-    y->tv_usec -= 1000000 * nsec;
-    y->tv_sec += nsec;
-  }
-  if (x->tv_usec - y->tv_usec > 1000000) {
-    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
-    y->tv_usec += 1000000 * nsec;
-    y->tv_sec -= nsec;
-  }
-
-  /* Compute the time remaining to wait.
-     tv_usec is certainly positive. */
-  result->tv_sec = x->tv_sec - y->tv_sec;
-  result->tv_usec = x->tv_usec - y->tv_usec;
-
-  /* Return 1 if result is negative. */
-  return x->tv_sec < y->tv_sec;
-}
-
-void sleep_until(time_t dst_sec) {
-  struct timespec dst;
-  dst.tv_sec = dst_sec;
-  dst.tv_nsec = 0;
-  while (clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &dst, NULL)) /* nothing */;
-}
-
-time_t round_up(time_t t, int align) {
-  t = t - 1; /* counter bad +t for aligned things in last step */
-  t = t - t%align; /* round down to align */
-  t = t + align; /* add alignment to make it a round up */
-  return t;
-}
+#include "common.c"

 
 void handle_connection(int s) {
   dup2(s, 1);
 
 void handle_connection(int s) {
   dup2(s, 1);


@@ -57,6 +6,7 @@ void handle_connection(int s) {
 
   char line_in[100];
   if (!fgets(line_in, 100, stdin)) return;
 
   char line_in[100];
   if (!fgets(line_in, 100, stdin)) return;

+  if (!strncmp(line_in, "GET /", strlen("GET /"))) return;

   char *p = line_in + strlen("GET /");
 
   setbuf(stdout, NULL);
   char *p = line_in + strlen("GET /");
 
   setbuf(stdout, NULL);