Forced commit, undo previous accidental checkin.

[openldap] / libraries / liblutil / utils.c

diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c
index 8d5fe6b479c2976552bfb765e368117e6cd8dd13..973406f21ebde25448f840517aba226129c7b79b 100644 (file)
--- a/libraries/liblutil/utils.c
+++ b/libraries/liblutil/utils.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -8,31 +8,102 @@
 
 #include <ac/stdlib.h>
 #include <ac/string.h>
+#include <ac/unistd.h>
+#include <ac/time.h>
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
-#include <lber.h>
 #include <lutil.h>
 #include <ldap_defaults.h>
 
+#ifdef HAVE_EBCDIC
+int _trans_argv = 1;
+#endif
+
 char* lutil_progname( const char* name, int argc, char *argv[] )
 {
        char *progname;
 
        if(argc == 0) {
-               return ber_strdup( name );
+               return (char *)name;
        }
 
+#ifdef HAVE_EBCDIC
+       if (_trans_argv) {
+               int i;
+               for (i=0; i<argc; i++) __etoa(argv[i]);
+               _trans_argv = 0;
+       }
+#endif
        progname = strrchr ( argv[0], *LDAP_DIRSEP );
-       progname = ber_strdup( progname ? &progname[1] : argv[0] );
+       progname = progname ? &progname[1] : argv[0];
 
        return progname;
 }
 
+size_t lutil_gentime( char *s, size_t max, const struct tm *tm )
+{
+       size_t ret;
+#ifdef HAVE_EBCDIC
+/* We've been compiling in ASCII so far, but we want EBCDIC now since
+ * strftime only understands EBCDIC input.
+ */
+#pragma convlit(suspend)
+#endif
+       ret = strftime( s, max, "%Y%m%d%H%M%SZ", tm );
+#ifdef HAVE_EBCDIC
+#pragma convlit(resume)
+       __etoa( s );
+#endif
+       return ret;
+}
+
+/* strcopy is like strcpy except it returns a pointer to the trailing NUL of
+ * the result string. This allows fast construction of catenated strings
+ * without the overhead of strlen/strcat.
+ */
+char *
+lutil_strcopy(
+       char *a,
+       const char *b
+)
+{
+       if (!a || !b)
+               return a;
+       
+       while ((*a++ = *b++)) ;
+       return a-1;
+}
+
+/* strncopy is like strcpy except it returns a pointer to the trailing NUL of
+ * the result string. This allows fast construction of catenated strings
+ * without the overhead of strlen/strcat.
+ */
+char *
+lutil_strncopy(
+       char *a,
+       const char *b,
+       size_t n
+)
+{
+       if (!a || !b || n == 0)
+               return a;
+       
+       while ((*a++ = *b++) && n-- > 0) ;
+       return a-1;
+}
+
 #ifndef HAVE_MKSTEMP
 int mkstemp( char * template )
 {
+#ifdef HAVE_MKTEMP
        return open ( mktemp ( template ), O_RDWR|O_CREAT|O_EXCL, 0600 );
+#else
+       return -1;
+#endif
 }
 #endif