[DRBD-cvs] DRBD CVS: user by phil from

drbd-cvs@linbit.com drbd-cvs@linbit.com
Mon, 12 Jan 2004 20:49:41 +0100 (CET)


DRBD CVS committal

Author  : phil
Host    : 
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	Makefile drbdadm_main.c 


Log Message:
* Micro makefile fixes
* Fixes for the usual was-never-tested bugs to the last changes in drbd_actlog.c
* Changed return value of drbd_process_ee(), if the function is interrupted
  by a signal from 0 (=fatal) to 2 (= I was interrupted by a signal, do something
  and call me again)
* Be more verbose on the SyncSource side if resynchronisation is paused.
* Made drbdadm to no longer echo each drbdsetup commandline to stderr.    

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Makefile,v
retrieving revision 1.7.2.12
retrieving revision 1.7.2.13
diff -u -3 -r1.7.2.12 -r1.7.2.13
--- Makefile	10 Jan 2004 15:30:41 -0000	1.7.2.12
+++ Makefile	12 Jan 2004 19:49:41 -0000	1.7.2.13
@@ -17,7 +17,7 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-CFLAGS = -g -c -Wall
+CFLAGS = -c -Wall
 CC = gcc
 
 all: drbdsetup drbdadm
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -3 -r1.1.2.28 -r1.1.2.29
--- drbdadm_main.c	10 Jan 2004 15:30:41 -0000	1.1.2.28
+++ drbdadm_main.c	12 Jan 2004 19:49:41 -0000	1.1.2.29
@@ -312,12 +312,11 @@
   sigemptyset(&sa.sa_mask);
   sa.sa_flags=0;
 
-  while(*cmdline) {
-    fprintf(dry_run?stdout:stderr,"%s ",*cmdline++);
-  }
-  fprintf(dry_run?stdout:stderr,"\n");
-
   if(dry_run) {
+    while(*cmdline) {
+      fprintf(stdout,"%s ",*cmdline++);
+    }
+    fprintf(stdout,"\n");
     return 0;
   }