Rename strNcpy to StrNCpy, and change third parameter.

5 files changed, 11 insertions, 11 deletions

diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 19a52757370..24c3199c1a5 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.15 1997/09/08 21:43:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.16 1997/10/25 01:09:16 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -269,7 +269,7 @@ lo_import(text *filename)
 	/*
 	 * open the file to be read in
 	 */
-	strNcpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ);
+	StrNCpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ + 1);
 	fd = open(fnamebuf, O_RDONLY, 0666);
 	if (fd < 0)
 	{							/* error */
@@ -343,7 +343,7 @@ lo_export(Oid lobjId, text *filename)
 	 * open the file to be written to
 	 */
 	oumask = umask((mode_t) 0);
-	strNcpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ);
+	StrNCpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ + 1);
 	fd = open(fnamebuf, O_CREAT | O_WRONLY, 0666);
 	umask(oumask);
 	if (fd < 0)
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 31be26425f9..292cf3730e4 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.7 1997/09/08 21:43:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.8 1997/10/25 01:09:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,7 +241,7 @@ strmake(char *str, int len)
 		len = strlen(str);
 
 	newstr = (char *) palloc((unsigned) len + 1);
-	strNcpy(newstr, str, len);
+	StrNCpy(newstr, str, len+1);
 	newstr[len] = (char) 0;
 	return newstr;
 }
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index bd2f6bee201..aaa204b4db9 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -90,7 +90,7 @@ verify_password(char *user, char *password, Port *port,
 		if (test_pw[strlen(test_pw) - 1] == '\n')
 			test_pw[strlen(test_pw) - 1] = '\0';
 
-		strNcpy(salt, test_pw, 2);
+		StrNCpy(salt, test_pw, 3);
 
 		if (strcmp(user, test_user) == 0)
 		{
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index c85b3a763c2..7e8cab0afef 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.9 1997/09/08 21:43:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.10 1997/10/25 01:09:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -154,7 +154,7 @@ PQpnames(char **pnames, int rule_p)
 		{
 			if (!rule_p || portals[i]->portal->rule_p)
 			{
-				strncpy(pnames[cur_pname], portals[i]->name, PortalNameLength);
+				strncpy(pnames[cur_pname], portals[i]->name, PortalNameLength+1);
 				++cur_pname;
 			}
 		}
@@ -730,7 +730,7 @@ PQappendNotify(char *relname, int pid)
 		pqNotifyList = DLNewList();
 
 	p = (PQNotifyList *) pbuf_alloc(sizeof(PQNotifyList));
-	strNcpy(p->relname, relname, NAMEDATALEN - 1);
+	StrNCpy(p->relname, relname, NAMEDATALEN);
 	p->be_pid = pid;
 	p->valid = 1;
 	DLAddTail(pqNotifyList, DLNewElem(p));
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index bff6a449ead..82956fe2329 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.7 1997/09/08 21:43:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.8 1997/10/25 01:09:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -384,7 +384,7 @@ void
 pbuf_setportalinfo(PortalEntry *entry, char *pname)
 {
 	if (entry)
-		strNcpy(entry->name, pname, PortalNameLength - 1);
+		StrNCpy(entry->name, pname, PortalNameLength);
 }
 
 /* --------------------------------