Lots of little code cleanups to prevent warnings - mostly making sure

[mmh] / uip / picksbr.c

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 88463ed..b13ea66 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -9,6 +9,17 @@
 #include <zotnet/tws/tws.h>
 #include <h/picksbr.h>
 
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef TM_IN_SYS_TIME
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 static struct swit parswit[] = {
 #define        PRAND                   0
     { "and", 0 },
@@ -641,14 +652,15 @@ plist
                ebp = ibuf + strlen (ibuf);
            }
            c = *p2++;
-           if (lf && c != '\n')
+           if (lf && c != '\n') {
                if (c != ' ' && c != '\t') {
                    --p2;
                    break;
                }
                else
                    lf = 0;
-           if (c == '\n')
+           }
+           if (c == '\n') {
                if (body)
                    break;
                else {
@@ -659,6 +671,7 @@ plist
                    lf++;
                    c = ' ';
                }
+           }
            if (c && p1 < &linebuf[LBSIZE - 1])
                *p1++ = c;
        }