Changeset 279

Timestamp:

Jun 18, 2009, 6:03:07 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Change in debug.c (by ydario)

File:

• branches/samba-3.0/source/lib/debug.c (modified) (5 diffs)

branches/samba-3.0/source/lib/debug.c

@@ -574 +574 @@
         else {
                 const char *p = strrchr_m( pname,'/' );
+                if (!p)
+                        p = strrchr_m( pname,'\\' );
                 if (p)
                         pname = p + 1;
@@ -606 +608 @@
 
         oldumask = umask( 022 );
-  
+
         pstrcpy(fname, debugf );
         debugf[0] = '\0';
@@ -619 +621 @@
 
         pstrcpy( debugf, fname );
-        new_dbf = x_fopen( debugf, O_WRONLY|O_APPEND|O_CREAT, 0644);
+
+#ifdef __OS2__
+        // YD we need to close the file before reopening, otherwise it is not
+        // possible to rename the log
+        if (dbf) {
+                (void) x_fclose(dbf);
+                dbf = NULL;
+        }
+#endif
+
+        new_dbf = x_fopen( debugf, O_WRONLY|O_APPEND|O_CREAT, 0777);
 
         if (!new_dbf) {
@@ -644 +656 @@
 
         /* Take over stderr to catch ouput into logs */
+#ifndef __OS2__
+        // this opens debug file twice!
         if (dbf && sys_dup2(x_fileno(dbf), 2) == -1) {
                 close_low_fds(True); /* Close stderr too, if dup2 can't point it
                                         at the logfile */
         }
+#endif
 
         return ret;
@@ -708 +723 @@
 
                         slprintf( name, sizeof(name)-1, "%s.old", debugf );
+#ifdef __OS2__
+                        (void)unlink( name );
+#endif
                         (void)rename( debugf, name );
-      
+
                         if (!reopen_logs()) {
                                 /* We failed to reopen a log - continue using the old name. */