CHANSERV: fix issue where chanserv_relay doesn't wait for db to be loaded before...

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

diff --git a/lib/irc_string.c b/lib/irc_string.c
index ca43d848fe9be0b7e4860944d32423ff57ccb11c..28ac047e141bd9583af3c6f6f80ca27b13b0dcf9 100644 (file)
--- a/lib/irc_string.c
+++ b/lib/irc_string.c
@@ -220,26 +220,26 @@ char *delchars(char *string, const char *badchars) {
  * IPtostr:
  *  Converts a long into a "p.q.r.s" IP address
  */
-/* deprecated due to patricia tree stuff */
-/*
-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);
  
   return buf;
 }
-*/
 
 /*
  * 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;
@@ -247,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);
     }
   }