fix up minor gotcha introduced by fgets change

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index adedc4f6c5fce1d3c2d0ac4a93784622373e5279..d0743d7971288c5bc9cede9e851e121929369212 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.152  2002/03/13 04:11:11  nbryant
+ fix up minor gotcha introduced by fgets change
+
  Revision 590.151  2002/03/13 03:58:29  ajc
  * Site-configurable option "Allow system Aides to gain access to mailboxes"
 
@@ -3499,3 +3502,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/migratenet.c b/citadel/migratenet.c
index 3717f83a9193752b965ebe9ae13dec978a92b2eb..ded52ff641d556de2ac9c09d127481b62bb3f488 100644 (file)
--- a/citadel/migratenet.c
+++ b/citadel/migratenet.c
@@ -112,11 +112,11 @@ int main(int argc, char **argv)
 
                        fprintf(nodefp, "%s|", d->d_name);
                        printf("Enter shared secret: ");
-                       fgets(buf, sizeof buf, stdin);
+                       myfgets(buf, sizeof buf, stdin);
                        if (buf[0] == 0) strcpy(buf, config.c_net_password);
                        fprintf(nodefp, "%s|", buf);
                        printf("Enter host name/IP : ");
-                       fgets(buf, sizeof buf, stdin);
+                       myfgets(buf, sizeof buf, stdin);
                        if (buf[0] == 0) snprintf(buf, sizeof buf, "%s.citadel.org",
                                d->d_name);
                        fprintf(nodefp, "%s|", buf);

diff --git a/citadel/tools.c b/citadel/tools.c
index 2c21bfe7ae30da84a2d0cf690c42a59a894b746e..0bd365ac7963cf5a8797df7ecd5d2ab432bb4ebe 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -534,3 +534,17 @@ void stripallbut(char *str, char leftboundary, char rightboundary) {
        }
 
 }
+
+char *myfgets(char *s, int size, FILE *stream) {
+       char *ret = fgets(s, size, stream);
+       char *nl;
+
+       if (ret != NULL) {
+               nl = strchr(s, '\n');
+
+               if (nl != NULL)
+                       *nl = 0;
+       }
+
+       return ret;
+}

diff --git a/citadel/tools.h b/citadel/tools.h
index e168a96ed46a2eeecc6d38ef1106710ed0476ccf..d93e93d3773d623b975c7382425931894b4ef5de 100644 (file)
--- a/citadel/tools.h
+++ b/citadel/tools.h
@@ -25,3 +25,5 @@ int strncasecmp(char *, char *, int)
 #define num_parms(source)              num_tokens(source, '|')
 void stripout(char *str, char leftboundary, char rightboundary);
 void stripallbut(char *str, char leftboundary, char rightboundary);
+
+char *myfgets(char *s, int size, FILE *stream);