Fixes for MingW: (passes test007, with LDAP_DIRSEP tweaks in slapd.conf)

  must include <ac/stdlib.h> to get MAX_PATH defined.
  use LDAP_DIRSEP instead of '/' in paths
  define truncate/ftruncate macros, etc.

diff --git a/servers/slurpd/admin.c b/servers/slurpd/admin.c
index 6e234408e07b21c5a158ee2a9f20b67845331e24..758c06abf56476174bbcc309574634e4eaf27608 100644 (file)
--- a/servers/slurpd/admin.c
+++ b/servers/slurpd/admin.c
@@ -23,6 +23,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/stdlib.h>
 
 #include <ac/signal.h>
 

diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index af03b10654e89888a12015f25641e460262e3391..42629525241d2da007d2b8c62565f58050362deb 100644 (file)
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -61,7 +61,7 @@ doargs(
     int                i;
     int                rflag = 0;
 
-    if ( (g->myname = strrchr( argv[0], '/' )) == NULL ) {
+    if ( (g->myname = strrchr( argv[0], LDAP_DIRSEP[0] )) == NULL ) {
        g->myname = strdup( argv[0] );
     } else {
        g->myname = strdup( g->myname + 1 );
@@ -120,7 +120,7 @@ doargs(
            break;
        case 't':       /* dir to use for our copies of replogs */
            g->slurpd_rdir = (char *)malloc (strlen(optarg) + sizeof("/replica"));
-           sprintf(g->slurpd_rdir, "%s/replica", optarg);
+           sprintf(g->slurpd_rdir, "%s" LDAP_DIRSEP "replica", optarg);
            break;
        default:
            usage( g->myname );
@@ -135,11 +135,11 @@ doargs(
     }
 
     /* Set location/name of our private copy of the slapd replog file */
-    sprintf( g->slurpd_replogfile, "%s/%s", g->slurpd_rdir,
+    sprintf( g->slurpd_replogfile, "%s" LDAP_DIRSEP "%s", g->slurpd_rdir,
            DEFAULT_SLURPD_REPLOGFILE );
 
     /* Set location/name of the slurpd status file */
-    sprintf( g->slurpd_status_file, "%s/%s", g->slurpd_rdir,
+    sprintf( g->slurpd_status_file, "%s" LDAP_DIRSEP "%s", g->slurpd_rdir,
            DEFAULT_SLURPD_STATUS_FILE );
 
        ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &ldap_debug);

diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c
index 3bafef51560a41159896e0ef3e264df991e886b4..0bd0329ba0409d4994c7b9aa46a9778dad7cabfa 100644 (file)
--- a/servers/slurpd/globals.c
+++ b/servers/slurpd/globals.c
@@ -32,7 +32,11 @@
 Globals                 *sglob;
 
 int ldap_syslog = 0;
+#ifdef LOG_DEBUG
 int ldap_syslog_level = LOG_DEBUG;
+#else
+int ldap_syslog_level = 0;
+#endif
 int ldap_debug = 0;
 
 

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 7a391221b50530b28aecb430a00223010e47df59..8965ff0f79e1f4b0f031f63dba700d53a11a513a 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -111,8 +111,10 @@ main(
      * Detach from the controlling terminal
      * unless the -d flag is given or in one-shot mode.
      */
+#ifndef HAVE_WINSOCK
     if ( ! (sglob->no_detach || sglob->one_shot_mode) )
        lutil_detach( 0, 0 );
+#endif
 
     /*
      * Start the main file manager thread (in fm.c).

diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index 7fd254893cf6b7ba015ca22ae2a2e17909f3d441..b921728ef0c0ce9760a3fa9280e4f407336a72bc 100644 (file)
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>

diff --git a/servers/slurpd/reject.c b/servers/slurpd/reject.c
index d3346cf50902bd53205307c82ea02e22b170ee93..a8f2f657b79dca972b265e5f224bdb7144b872ec 100644 (file)
--- a/servers/slurpd/reject.c
+++ b/servers/slurpd/reject.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/errno.h>
 #include <ac/unistd.h>
 
@@ -56,7 +57,7 @@ write_reject(
     int                rc;
 
     ldap_pvt_thread_mutex_lock( &sglob->rej_mutex );
-    sprintf( rejfile, "%s/%s:%d.rej", sglob->slurpd_rdir,
+    sprintf( rejfile, "%s" LDAP_DIRSEP "%s:%d.rej", sglob->slurpd_rdir,
            ri->ri_hostname, ri->ri_port );
 
     if ( access( rejfile, F_OK ) < 0 ) {

diff --git a/servers/slurpd/replica.c b/servers/slurpd/replica.c
index 9bb77ca8ef7dfcc190dec778c33aca82d8c4120f..f5bf393cb1ddbe21bd727fac61a1b5afaf0fcd2a 100644 (file)
--- a/servers/slurpd/replica.c
+++ b/servers/slurpd/replica.c
@@ -23,6 +23,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/stdlib.h>
 
 #include "slurp.h"
 #include "globals.h"

diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c
index a93f9040d50b194570c85bcc2e8d16e59a3265eb..f43965b8e7687d74569f9c66381d6efe07f0fa25 100644 (file)
--- a/servers/slurpd/replog.c
+++ b/servers/slurpd/replog.c
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/errno.h>
 #include <ac/param.h>
 #include <ac/string.h>
@@ -71,7 +72,7 @@ copy_replog(
      * with a fatal error.
      */
     strcpy( buf, src );
-    if (( p = strrchr( buf, '/' )) == NULL ) {
+    if (( p = strrchr( buf, LDAP_DIRSEP[0] )) == NULL ) {
        strcpy( buf, "." );
     } else {
        *p = '\0';
@@ -89,7 +90,7 @@ copy_replog(
        return( -1 );
     }
     strcpy( buf, dst );
-    if (( p = strrchr( buf, '/' )) == NULL ) {
+    if (( p = strrchr( buf, LDAP_DIRSEP[0] )) == NULL ) {
        strcpy( buf, "." );
     } else {
        *p = '\0';

diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index 5dbdaf855d6e53f3d233407c21202ed89f2e6e5a..f7f2227875e3ebdfacbc804fa8b3029245007ff1 100644 (file)
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -53,7 +53,9 @@ Ri_process(
     char       *errmsg;
 
     (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
+#ifdef SIGPIPE
     (void) SIGNAL( SIGPIPE, SIG_IGN );
+#endif
     if ( ri == NULL ) {
 #ifdef NEW_LOGGING
        LDAP_LOG (( "ri", LDAP_LEVEL_ERR, "Ri_process: "

diff --git a/servers/slurpd/sanity.c b/servers/slurpd/sanity.c
index e6335b942bcb73a4a76e76afa81296f452456054..271b1f1cb4ab5f9614ff73b3aea5623e9a026759 100644 (file)
--- a/servers/slurpd/sanity.c
+++ b/servers/slurpd/sanity.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/unistd.h>
 #include <ac/string.h>
 
@@ -185,7 +186,7 @@ filecheck(
     unsigned int       ret = 0;
 
     strcpy( dir, f );
-    p = strrchr( dir, '/' );
+    p = strrchr( dir, LDAP_DIRSEP[0] );
     if ( p != NULL ) {
        *p = '\0';
     }

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index b8a84bcedcf9b88f417a782297492c4e9e814457..0cb25e3736ddf4701a499defbd2a655e7edfed3a 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -20,7 +20,7 @@
 #ifndef _SLURPD_H_
 #define _SLURPD_H_
 
-#ifndef LDAP_SYSLOG
+#if !defined(HAVE_WINSOCK) && !defined(LDAP_SYSLOG)
 #define LDAP_SYSLOG 1
 #endif
 
@@ -42,6 +42,12 @@
 #include "ldap_defaults.h"
 #include "ldif.h"
 
+#ifdef HAVE_WINSOCK
+#define ftruncate(a,b) _chsize(a,b)
+#define truncate(a,b) _lclose( _lcreat(a, 0))
+#define S_IRGRP 0
+#define S_IWGRP 0
+#endif
 
 /* Default directory for slurpd's private copy of replication logs */
 #define        DEFAULT_SLURPD_REPLICA_DIR      LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"