From jon@symas.com - patches for consistent use of directory separators

in pathnames.

diff --git a/clients/finger/main.c b/clients/finger/main.c
index 96f8d3595c3f65f9ff5a68a2b871a3403c73f6f5..ec2a07460e867722c8c5b70cfc9755292831818a 100644 (file)
--- a/clients/finger/main.c
+++ b/clients/finger/main.c
@@ -122,7 +122,7 @@ main( int argc, char **argv )
        }
 #endif
 
-       if ( (myname = strrchr( argv[0], '/' )) == NULL )
+       if ( (myname = strrchr( argv[0], *LDAP_DIRSEP )) == NULL )
                myname = strdup( argv[0] );
        else
                myname = strdup( myname + 1 );

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index 789fbe435350a1623cf1e389a67075a7e7e8f0cf..cbe5bb80372f1ce7343e6af71f9ef0deae4b17b7 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -163,7 +163,7 @@ main ( int argc, char **argv )
        int             numto, ngroups, numerr, nargs;
        int             i, j;
 
-       if ( (myname = strrchr( argv[0], '/' )) == NULL )
+       if ( (myname = strrchr( argv[0], *LDAP_DIRSEP )) == NULL )
                myname = strdup( argv[0] );
        else
                myname = strdup( myname + 1 );

diff --git a/clients/maildap/main.c b/clients/maildap/main.c
index 9a501d8408793d6b500fc3d27a7aff0d5d28aef1..36b58576b8439c13ced327235eddad9e1d226296 100644 (file)
--- a/clients/maildap/main.c
+++ b/clients/maildap/main.c
@@ -191,7 +191,7 @@ main ( int argc, char **argv )
        int             i, j;
        char            *conffile = NULL;
 
-       if ( (myname = strrchr( argv[0], '/' )) == NULL )
+       if ( (myname = strrchr( argv[0], *LDAP_DIRSEP )) == NULL )
                myname = strdup( argv[0] );
        else
                myname = strdup( myname + 1 );

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 57a1444b70eceba2f785074f4f39bfdcb2afeb10..466a32c35a856bffc38e8d475cdb69ab86741bbf 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -590,7 +590,7 @@ main( int argc, char **argv )
                }
 #else
                fprintf( stderr, "%s: not compiled with SASL support\n",
-                       argv[0] );
+                       prog );
                return( EXIT_FAILURE );
 #endif
        }

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 08319972f70b2159dd7f2047b1d2a4d99e478e49..82390b7fdd8c2861b19d8639742088bc4afd2555 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -659,7 +659,7 @@ main( int argc, char **argv )
                }
 #else
                fprintf( stderr, "%s: not compiled with SASL support\n",
-                       argv[0] );
+                       prog );
                return( EXIT_FAILURE );
 #endif
        }

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index a6bf34b5125e3dc6be728d26d553ae435179b2bc..e3475e5553d5552bd5d3b6ba2768a49bc8378fef 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -482,7 +482,7 @@ main(int argc, char **argv)
        default:
                fprintf( stderr, "%s: unrecognized option -%c\n",
                        prog, optopt );
-           usage( argv[0] );
+           usage( prog );
            return( EXIT_FAILURE );
        }
     }
@@ -512,7 +512,7 @@ main(int argc, char **argv)
     } else if ( argc - optind != 0 ) {
        fprintf( stderr, "%s: invalid number of arguments (%d), "
                "only two allowed\n", prog, argc-optind );
-       usage( argv[0] );
+       usage( prog );
        return( EXIT_FAILURE );
     }
 
@@ -627,7 +627,7 @@ main(int argc, char **argv)
                }
 #else
                fprintf( stderr, "%s: not compiled with SASL support\n",
-                       argv[0] );
+                       prog );
                return( EXIT_FAILURE );
 #endif
        }

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 8d254aabed18d96d9bbf80d7419de19d1a0a7464..f161ac79ad927d905520f763c5bc97220f36f80f 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -483,7 +483,7 @@ main( int argc, char *argv[] )
                default:
                        fprintf( stderr, "%s: unrecognized option -%c\n",
                                prog, optopt );
-                       usage (argv[0]);
+                       usage (prog);
                }
        }
 
@@ -496,7 +496,7 @@ main( int argc, char *argv[] )
        }
 
        if( argc - optind > 1 ) {
-               usage( argv[0] );
+               usage( prog );
        } else if ( argc - optind == 1 ) {
                user = strdup( argv[optind] );
        } else {
@@ -636,7 +636,7 @@ main( int argc, char *argv[] )
                }
 #else
                fprintf( stderr, "%s: not compiled with SASL support\n",
-                       argv[0] );
+                       prog );
                return( EXIT_FAILURE );
 #endif
        }

diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index fa97178f603feffd44caded2cdb1d1943f8c7cb4..9e208603837a77df31470154d294888f3382fb3d 100644 (file)
--- a/clients/ud/edit.c
+++ b/clients/ud/edit.c
@@ -143,7 +143,7 @@ load_editor( void )
 #endif
 
 #ifdef HAVE_MKSTEMP
-       sprintf(entry_temp_file, "/tmp/udXXXXXX");
+       strcpy(entry_temp_file, LDAP_TMPDIR LDAP_DIRSEP "udXXXXXX");
 
        tmpfd = mkstemp(entry_temp_file);
 
@@ -192,7 +192,7 @@ load_editor( void )
        if (verbose) {
                char    *p;
 
-               if (( p = strrchr( editor, '/' )) == NULL ) {
+               if (( p = strrchr( editor, *LDAP_DIRSEP )) == NULL ) {
                        p = editor;
                } else {
                        ++p;

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 227617704cb96ff7a2fea78d6138a628bbb20e99..05b931a4df6769ef6e05a06c0c555b8b45fff901 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -263,11 +263,11 @@ static void openldap_ldap_init_w_userconf(const char *file)
                /* we assume UNIX path syntax is used... */
 
                /* try ~/file */
-               sprintf(path, "%s/%s", home, file);
+               sprintf(path, "%s%s%s", home, LDAP_DIRSEP, file);
                openldap_ldap_init_w_conf(path, 1);
 
                /* try ~/.file */
-               sprintf(path, "%s/.%s", home, file);
+               sprintf(path, "%s%s.%s", home, LDAP_DIRSEP, file);
                openldap_ldap_init_w_conf(path, 1);
        }
 

diff --git a/libraries/libldif/fetch.c b/libraries/libldif/fetch.c
index 1f62be80e0a971a8591a9a13d714e7fcae492304..3038676501e40649988653555502751ac1b8855e 100644 (file)
--- a/libraries/libldif/fetch.c
+++ b/libraries/libldif/fetch.c
@@ -51,7 +51,8 @@ ldif_fetch_url(
                        return -1;
                }
 
-               if( *p != *LDAP_DIRSEP ) {
+               /* we don't check for LDAP_DIRSEP since URLs should contain '/' */
+               if( *p != '/' ) {
                        /* skip over false root */
                        p++;
                }

diff --git a/libraries/liblunicode/ucdata/ucdata.c b/libraries/liblunicode/ucdata/ucdata.c
index 01a94a02946fb3b5e35233e0f6833245053b2bf6..24be72df649339dac8a569beb5e3b73ef179a8e7 100644 (file)
--- a/libraries/liblunicode/ucdata/ucdata.c
+++ b/libraries/liblunicode/ucdata/ucdata.c
@@ -27,6 +27,7 @@
 /* $Id: ucdata.c,v 1.4 2001/01/02 18:46:20 mleisher Exp $" */
 
 #include "portable.h"
+#include "ldap_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,12 +37,6 @@
 
 #include "ucdata.h"
 
-#ifdef WIN32
-#define UC_DIRSEP      '\\'
-#else
-#define UC_DIRSEP      '/'
-#endif
-
 /**************************************************************************
  *
  * Miscellaneous types, data, and support functions.
@@ -89,7 +84,7 @@ _ucopenfile(char *paths, char *filename, char *mode)
         pp = path;
         while (*dp && *dp != ':')
           *pp++ = *dp++;
-        *pp++ = UC_DIRSEP;
+        *pp++ = *LDAP_DIRSEP;
 
         fp = filename;
         while (*fp)

diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index ff165f7308d48b2e08a8d06f82056afdea409b4e..faedd216f3bc9c6c4cfbfbba3f5cc8f74d83c279 100644 (file)
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -23,6 +23,7 @@
 /* $Id: ucgendat.c,v 1.4 2001/01/02 18:46:20 mleisher Exp $" */
 
 #include "portable.h"
+#include "ldap_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1181,7 +1182,7 @@ write_cdata(char *opath)
     /*
      * Open the ctype.dat file.
      */
-    sprintf(path, "%s/ctype.dat", opath);
+    sprintf(path, "%s%sctype.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1252,7 +1253,7 @@ write_cdata(char *opath)
     /*
      * Open the case.dat file.
      */
-    sprintf(path, "%s/case.dat", opath);
+    sprintf(path, "%s%scase.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1307,7 +1308,7 @@ write_cdata(char *opath)
     /*
      * Open the comp.dat file.
      */
-    sprintf(path, "%s/comp.dat", opath);
+    sprintf(path, "%s%scomp.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
        return;
     
@@ -1345,7 +1346,7 @@ write_cdata(char *opath)
     /*
      * Open the decomp.dat file.
      */
-    sprintf(path, "%s/decomp.dat", opath);
+    sprintf(path, "%s%sdecomp.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1405,7 +1406,7 @@ write_cdata(char *opath)
     /*
      * Open the cmbcl.dat file.
      */
-    sprintf(path, "%s/cmbcl.dat", opath);
+    sprintf(path, "%s%scmbcl.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1443,7 +1444,7 @@ write_cdata(char *opath)
     /*
      * Open the num.dat file.
      */
-    sprintf(path, "%s/num.dat", opath);
+    sprintf(path, "%s%snum.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1496,7 +1497,7 @@ main(int argc, char *argv[])
     FILE *in;
     char *prog, *opath;
 
-    if ((prog = strrchr(argv[0], '/')) != 0)
+    if ((prog = strrchr(argv[0], *LDAP_DIRSEP)) != 0)
       prog++;
     else
       prog = argv[0];