X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=zotnet%2Fbboards%2Fgetbbent.c;h=c820d69f293ebf72a78dc1d845f00c48bf8ceb54;hb=278a48ef53b5dde10d7c88f67f51ce15ad11c0c0;hp=b9904be25bff5d776bb624ea7d95d30dcb0f6535;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/zotnet/bboards/getbbent.c b/zotnet/bboards/getbbent.c
index b9904be..c820d69 100644
--- a/zotnet/bboards/getbbent.c
+++ b/zotnet/bboards/getbbent.c
@@ -5,6 +5,7 @@
  * $Id$
  */
 
+#include "h/mh.h"   /* for snprintf() */
 #include <h/nmh.h>
 
 #ifdef MMDFONLY
@@ -91,7 +92,7 @@ static void BBread (void);
 static int getbbitem (struct bboard *, char *, int (*)());
 static int  bblose (char *, ...);
 static char *bbskip (char *, char);
-static char *getcpy (char *);
+static char *our_getcpy (char *);
 
 
 int
@@ -393,11 +394,12 @@ BBread (void)
     r = strchr(bb->bb_addr, '@');
     BBRequest[0] = 0;
 
-    if (*bb->bb_request == '-')
+    if (*bb->bb_request == '-') {
 	if (p == NULL && r && *r == '@')
 	    snprintf (BBRequest, sizeof(BBRequest), "%s%s%s", bb->bb_name, bb->bb_request, r);
 	else
 	    snprintf (BBRequest, sizeof(BBRequest), "%s%s", bb->bb_name, bb->bb_request);
+    }
     else
 	if (p == NULL && r && *r == '@' && *bb->bb_request)
 	    snprintf (BBRequest, sizeof(BBRequest), "%s%s", bb->bb_request, r);
@@ -511,7 +513,7 @@ ldrchk (struct bboard *b)
 	return 1;
 
     if (strcmp (b->bb_passwd,
-		crypt (getpass ("Password: "), b->bb_passwd)) == 0)
+		crypt (nmh_getpass ("Password: "), b->bb_passwd)) == 0)
 	return 1;
 
     fprintf (stderr, "Sorry\n");
@@ -532,19 +534,19 @@ getbbcpy (struct bboard *bp)
     if (b == NULL)
 	return NULL;
 
-    b->bb_name = getcpy (bp->bb_name);
-    b->bb_file = getcpy (bp->bb_file);
-    b->bb_archive = getcpy (bp->bb_archive);
-    b->bb_info = getcpy (bp->bb_info);
-    b->bb_map = getcpy (bp->bb_map);
-    b->bb_passwd = getcpy (bp->bb_passwd);
+    b->bb_name = our_getcpy (bp->bb_name);
+    b->bb_file = our_getcpy (bp->bb_file);
+    b->bb_archive = our_getcpy (bp->bb_archive);
+    b->bb_info = our_getcpy (bp->bb_info);
+    b->bb_map = our_getcpy (bp->bb_map);
+    b->bb_passwd = our_getcpy (bp->bb_passwd);
     b->bb_flags = bp->bb_flags;
     b->bb_count = bp->bb_count;
     b->bb_maxima = bp->bb_maxima;
-    b->bb_date = getcpy (bp->bb_date);
-    b->bb_addr = getcpy (bp->bb_addr);
-    b->bb_request = getcpy (bp->bb_request);
-    b->bb_relay = getcpy (bp->bb_relay);
+    b->bb_date = our_getcpy (bp->bb_date);
+    b->bb_addr = our_getcpy (bp->bb_addr);
+    b->bb_request = our_getcpy (bp->bb_request);
+    b->bb_relay = our_getcpy (bp->bb_relay);
 
     for (p = bp->bb_aka; *p; p++)
 	continue;
@@ -552,7 +554,7 @@ getbbcpy (struct bboard *bp)
 	q = (char **) calloc ((unsigned) (p - bp->bb_aka + 1), sizeof *q);
     if (q == NULL)
 	return NULL;
-    for (p = bp->bb_aka; *p; *q++ = getcpy (*p++))
+    for (p = bp->bb_aka; *p; *q++ = our_getcpy (*p++))
 	continue;
     *q = NULL;
 
@@ -562,7 +564,7 @@ getbbcpy (struct bboard *bp)
 	q = (char **) calloc ((unsigned) (p - bp->bb_leader + 1), sizeof *q);
     if (q == NULL)
 	return NULL;
-    for (p = bp->bb_leader; *p; *q++ = getcpy (*p++))
+    for (p = bp->bb_leader; *p; *q++ = our_getcpy (*p++))
 	continue;
     *q = NULL;
 
@@ -572,7 +574,7 @@ getbbcpy (struct bboard *bp)
 	q = (char **) calloc ((unsigned) (p - bp->bb_dist + 1), sizeof *q);
     if (q == NULL)
 	return NULL;
-    for (p = bp->bb_dist; *p; *q++ = getcpy (*p++))
+    for (p = bp->bb_dist; *p; *q++ = our_getcpy (*p++))
 	continue;
     *q = NULL;
 
@@ -717,7 +719,7 @@ bbskip (char *p, char c)
 
 
 static char *
-getcpy (char *s)
+our_getcpy (char *s)
 {
     register char *p;
     size_t len;