From ee43269afc128feb0b267a96f94dfba82accac35 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Wed, 13 Mar 2002 04:11:11 +0000 Subject: [PATCH] fix up minor gotcha introduced by fgets change --- citadel/ChangeLog | 4 ++++ citadel/migratenet.c | 4 ++-- citadel/tools.c | 14 ++++++++++++++ citadel/tools.h | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index adedc4f6c..d0743d797 100644 --- 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 Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/migratenet.c b/citadel/migratenet.c index 3717f83a9..ded52ff64 100644 --- 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 2c21bfe7a..0bd365ac7 100644 --- 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 e168a96ed..d93e93d37 100644 --- 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); -- 2.30.2