[DRBD-cvs] r1759 - trunk/user

[svn at svn.drbd.org]

Author: phil
Date: 2005-02-12 19:14:25 +0100 (Sat, 12 Feb 2005)
New Revision: 1759

Modified:
   trunk/user/drbdadm_main.c
   trunk/user/drbdmeta.c
Log:
Two micro fixes...


Modified: trunk/user/drbdadm_main.c
===================================================================
--- trunk/user/drbdadm_main.c	2005-02-12 17:48:17 UTC (rev 1758)
+++ trunk/user/drbdadm_main.c	2005-02-12 18:14:25 UTC (rev 1759)
@@ -873,6 +873,7 @@
   struct sigaction so,sa;
 
   saved_stdin = -1;
+  saved_stdout = -1;
   if( isatty(fileno(stdin)) == 0 || isatty(fileno(stdout)) == 0 ) {
     fprintf(stderr,"WARN: stdin/stdout is not a TTY; using /dev/console");
     fprintf(stdout,"WARN: stdin/stdout is not a TTY; using /dev/console");

Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2005-02-12 17:48:17 UTC (rev 1758)
+++ trunk/user/drbdmeta.c	2005-02-12 18:14:25 UTC (rev 1759)
@@ -554,8 +554,10 @@
 	char answer[16];
 	int rr;
 
-	printf("%s [yes/no] ", text);
-	rr = scanf("%[yesno]15s", answer);
+	do {
+		printf("%s [yes/no] ", text);
+		rr = scanf("%15s", answer);
+	} while (rr != 1);
 	return !strcmp(answer, "yes");
 }