BUILD: add require-all build mode

[irc/quakenet/newserv.git] / lib / irc_string.c

diff --git a/lib/irc_string.c b/lib/irc_string.c
index 58854212803b35828b4315aacf8429dab0ef5839..56e6b7b85d06fd802b665567bdc73165ecd1c217 100644 (file)
--- a/lib/irc_string.c
+++ b/lib/irc_string.c
@@ -17,6 +17,13 @@
  *
  * Copyright (c) 1998
  *      Andrea Cocito (Nemesi).
+ * Copyright (c)
+ *      Run (carlo@runaway.xs4all.nl) 1996
+ *
+ * mmatch/match/collapse
+ *
+ * Copyright (c)
+ *      Run (carlo@runaway.xs4all.nl) 1996
  *
  * License follows:
  *
@@ -115,7 +122,7 @@ int match2patterns(const char *patrn, const char *string) {
 /*  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or      */
 /*  code or tables extracted from it, as desired without restriction.    */
 /* Modified by Fox: no more length parameter, always does the whole string */
-unsigned long crc32(const char *s) {
+unsigned long irc_crc32(const char *s) {
   const char *cp;
   unsigned long crc32val;
   
@@ -127,7 +134,7 @@ unsigned long crc32(const char *s) {
 }
 
 /* Case insensitive version of the above */
-unsigned long crc32i(const char *s) {
+unsigned long irc_crc32i(const char *s) {
   const char *cp;
   unsigned long crc32val;
   
@@ -153,7 +160,7 @@ int ircd_strcmp(const char *s1, const char *s2) {
   register const char* u2 = s2;
 
   while(ToLower(*u1) == ToLower(*u2)) {
-    if(*u1++)
+    if(!*u1++)
       return 0;
 
     u2++;
@@ -171,7 +178,7 @@ int ircd_strncmp(const char *s1, const char *s2, size_t len) {
     return 0;
 
   while(ToLower(*u1) == ToLower(*u2)) {
-    if(*u1++ || !remaining--)
+    if(!*u1++ || !remaining--)
       return 0;
 
     u2++;
@@ -214,7 +221,7 @@ char *delchars(char *string, const char *badchars) {
  *  Converts a long into a "p.q.r.s" IP address
  */
 
-const char *IPtostr(unsigned long IP) {
+const char *IPlongtostr(unsigned long IP) {
   static char buf[16];
 
   sprintf(buf,"%lu.%lu.%lu.%lu",(IP>>24),(IP>>16)&255,(IP>>8)&255,IP&255);
@@ -225,12 +232,14 @@ const char *IPtostr(unsigned long IP) {
 /*
  * longtoduration: 
  *  Converts a specified number of seconds into a duration string.  
- *  format: 0 for the "/stats u" compatible output, 1 for more human-friendly output.
+ *  format: 0 for the "/stats u" compatible output, 1 for more
+ *  human-friendly output (that is sometimes format 0), and
+ *  2 for a different human-friendly output.
  */
 
 const char *longtoduration(unsigned long interval, int format) {
   int days,hours,minutes,seconds;
-  static char outstring[50];
+  static char outstring[100];
   int pos=0;
 
   seconds=interval%60;
@@ -238,18 +247,35 @@ const char *longtoduration(unsigned long interval, int format) {
   hours=(interval%(3600*24))/3600;
   days=interval/(3600*24);
 
-  if (days>0 || format==0) {
-    sprintf(outstring,"%d day%s, %02d:%02d:%02d",
-            days,(days==1)?"":"s",hours,minutes,seconds);
+  if(format<2) {
+    if (format==0 || (days>0 && (hours||minutes||seconds))) {
+      sprintf(outstring,"%d day%s, %02d:%02d:%02d",
+              days,(days==1)?"":"s",hours,minutes,seconds);
+    } else if (days>0) {
+      sprintf(outstring, "%d day%s",days,(days==1)?"":"s");
+    } else {
+      if (hours>0) {
+        pos += sprintf(outstring+pos,"%d hour%s ",hours,hours==1?"":"s");
+      }
+      if (minutes>0 || (hours>0 && seconds>0)) {
+        pos += sprintf(outstring+pos,"%d minute%s ",minutes,minutes==1?"":"s");
+      }
+      if (seconds>0 || !interval) {
+        sprintf(outstring+pos,"%d second%s ",seconds,seconds==1?"":"s");
+      }
+    }
   } else {
-    if (hours>0) {
-      pos += sprintf(outstring+pos,"%d hour%s ",hours,hours==1?"":"s");
+    if (days>0) {
+      pos += sprintf(outstring+pos, "%dd ",days);
+    }
+    if (hours>0 || (days>0 && (minutes>0 || seconds>0))) {
+      pos += sprintf(outstring+pos, "%dh ",hours);
     }
-    if (minutes>0 || (hours>0 && seconds>0)) {
-      pos += sprintf(outstring+pos,"%d minute%s ",minutes,minutes==1?"":"s");
+    if (minutes>0 || ((days>0 || hours>0) && seconds>0)) {
+      pos += sprintf(outstring+pos, "%dm ",minutes);
     }
-    if (seconds>0) {
-      pos += sprintf(outstring+pos,"%d second%s ",seconds,seconds==1?"":"s");
+    if (seconds>0 || !interval) {
+      sprintf(outstring+pos, "%ds ",seconds);
     }
   }
 
@@ -264,7 +290,7 @@ const char *longtoduration(unsigned long interval, int format) {
 int durationtolong(const char *string) {
   int total=0;
   int current=0;
-  char *ch=string,*och;
+  char *ch=(char *)string,*och;
 
   while (*ch) {
     och=ch;
@@ -308,7 +334,7 @@ int durationtolong(const char *string) {
   return total;
 }
 
-/* @GPL
+/*
  * mmatch()
  *
  * Written by Run (carlo@runaway.xs4all.nl), 25-10-96
@@ -327,6 +353,8 @@ int durationtolong(const char *string) {
  * a '?' in `new_mask' does not match a '\?' in `old_mask'.
  * And ofcourse... a '*' in `new_mask' does not match a '\*' in `old_mask'...
  * And last but not least, '\?' and '\*' in `new_mask' now become one character.
+ *
+ * Kindly BSD licensed by Run for Newserv.
  */
 
 int mmatch(const char *old_mask, const char *new_mask)
@@ -495,9 +523,10 @@ break_while:
   if (!ch)
     return 0;                   /* mask ends with '*', we got it */
   ch = ToLower(ch);
-  while (ToLower(*s++) != ch)
+  do {
     if (!*s)
       return 1;
+  } while (ToLower(*s++) != ch);
   bs = s;                       /* Next try start from here */
 
   /* Check the rest of the "chunk" */