first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[kai/samba.git] / source3 / lib / replace.c

diff --git a/source3/lib/replace.c b/source3/lib/replace.c
index a354458a686b587d3917220d102620b4820705b6..6a492f977c3b1044aaea0e570661123cb9413930 100644 (file)
--- a/source3/lib/replace.c
+++ b/source3/lib/replace.c
@@ -41,14 +41,16 @@ ftruncate for operating systems that don't have it
       fl.l_type = F_WRLCK;
       return fcntl(f, F_FREESP, &fl);
 }
-#endif
+#endif /* HAVE_FTRUNCATE */
 
 
 #ifndef HAVE_MKTIME
 /*******************************************************************
 a mktime() replacement for those who don't have it - contributed by 
 C.A. Lademann <cal@zls.com>
+Corrections by richard.kettlewell@kewill.com
 ********************************************************************/
+
 #define  MINUTE  60
 #define  HOUR    60*MINUTE
 #define  DAY             24*HOUR
@@ -57,16 +59,18 @@ C.A. Lademann <cal@zls.com>
 {
   struct tm       *u;
   time_t  epoch = 0;
+  int n;
   int             mon [] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
   y, m, i;
 
   if(t->tm_year < 70)
     return((time_t)-1);
 
+  n = t->tm_year + 1900 - 1;
   epoch = (t->tm_year - 70) * YEAR + 
-    (t->tm_year / 4 - 70 / 4 - t->tm_year / 100) * DAY;
+    ((n / 4 - n / 100 + n / 400) - (1969 / 4 - 1969 / 100 + 1969 / 400)) * DAY;
 
-  y = t->tm_year;
+  y = t->tm_year + 1900;
   m = 0;
 
   for(i = 0; i < t->tm_mon; i++) {
@@ -115,10 +119,11 @@ C.A. Lademann <cal@zls.com>
     }
   return unlink (zfrom);
 }
-#endif
+#endif /* HAVE_RENAME */
 
 
 #ifndef HAVE_INNETGR
+#if defined(HAVE_SETNETGRENT) && defined(HAVE_GETNETGRENT) && defined(HAVE_ENDNETGRENT)
 /*
  * Search for a match in a netgroup. This replaces it on broken systems.
  */
@@ -138,7 +143,8 @@ C.A. Lademann <cal@zls.com>
        endnetgrent();
        return (0);
 }
-#endif
+#endif /* HAVE_SETNETGRENT HAVE_GETNETGRENT HAVE_ENDNETGRENT */
+#endif /* HAVE_INNETGR */
 
 
 
@@ -156,7 +162,7 @@ C.A. Lademann <cal@zls.com>
        }
        /* yikes! no SETGROUPS or INITGROUPS? how can this work? */
        return(0);
-#else
+#else /* HAVE_SETGROUPS */
        gid_t  grouplst[NGROUPS_MAX];
        int    i,j;
        struct group *g;
@@ -181,10 +187,10 @@ C.A. Lademann <cal@zls.com>
                }
        }
        endgrent();
-       return(setgroups(i,grouplst));
-#endif
+       return(sys_setgroups(i,grouplst));
+#endif /* HAVE_SETGROUPS */
 }
-#endif
+#endif /* HAVE_INITGROUPS */
 
 
 #if (defined(SecureWare) && defined(SCO))
@@ -256,7 +262,7 @@ needs.
        }
        return(dest);
 }
-#endif
+#endif /* HAVE_MEMMOVE */
 
 #ifndef HAVE_STRDUP
 /****************************************************************************
@@ -264,7 +270,7 @@ duplicate a string
 ****************************************************************************/
  char *strdup(const char *s)
 {
-       int len;
+       size_t len;
        char *ret;
 
        if (!s) return(NULL);
@@ -275,7 +281,7 @@ duplicate a string
        memcpy(ret,s,len);
        return(ret);
 }
-#endif
+#endif /* HAVE_STRDUP */
 
 #ifdef REPLACE_INET_NTOA
 char *rep_inet_ntoa(struct in_addr ip)
@@ -285,28 +291,79 @@ char *rep_inet_ntoa(struct in_addr ip)
 #if WORDS_BIGENDIAN
        slprintf(buf, 17, "%d.%d.%d.%d", 
                 (int)p[0], (int)p[1], (int)p[2], (int)p[3]);
-#else
+#else /* WORDS_BIGENDIAN */
        slprintf(buf, 17, "%d.%d.%d.%d", 
                 (int)p[3], (int)p[2], (int)p[1], (int)p[0]);
-#endif
+#endif /* WORDS_BIGENDIAN */
        return buf;
 }
-#endif
+#endif /* REPLACE_INET_NTOA */
 
+#ifndef HAVE_STRTOUL
+#ifndef ULONG_MAX
+#define        ULONG_MAX       ((unsigned long)(~0L))          /* 0xFFFFFFFF */
+#endif
 
-#ifndef HAVE_SETENV
-/*****************************************************************
-set an env variable - some systems don't have this
-*****************************************************************/  
- int setenv(const char *name, const char *value, int overwrite)
+/*
+ * Convert a string to an unsigned long integer.
+ * Taken from libg++ - libiberty code.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+ unsigned long strtoul(const char *nptr, char **endptr, int base)
 {
-       pstring s;
-
-       if (!overwrite && getenv(name)) return 0;
-
-       slprintf(s,sizeof(s)-1,"%s=%s", name, value);
-
-       return putenv(s);
+       const char *s = nptr;
+       unsigned long acc;
+       int c;
+       unsigned long cutoff;
+       int neg = 0, any, cutlim;
+
+       /*
+        * See strtol for comments as to the logic used.
+        */
+       do {
+               c = *s++;
+       } while (isspace(c));
+       if (c == '-') {
+               neg = 1;
+               c = *s++;
+       } else if (c == '+')
+               c = *s++;
+       if ((base == 0 || base == 16) &&
+           c == '0' && (*s == 'x' || *s == 'X')) {
+               c = s[1];
+               s += 2;
+               base = 16;
+       }
+       if (base == 0)
+               base = c == '0' ? 8 : 10;
+       cutoff = (unsigned long)ULONG_MAX / (unsigned long)base;
+       cutlim = (int)((unsigned long)ULONG_MAX % (unsigned long)base);
+       for (acc = 0, any = 0;; c = *s++) {
+               if (isdigit(c))
+                       c -= '0';
+               else if (isalpha(c))
+                       c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+               else
+                       break;
+               if (c >= base)
+                       break;
+               if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+                       any = -1;
+               else {
+                       any = 1;
+                       acc *= base;
+                       acc += c;
+               }
+       }
+       if (any < 0) {
+               acc = ULONG_MAX;
+               errno = ERANGE;
+       } else if (neg)
+               acc = -acc;
+       if (endptr != 0)
+               *endptr = (char *) (any ? s - 1 : nptr);
+       return (acc);
 }
-
-#endif
+#endif /* HAVE_STRTOUL */