diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/char.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/adt/filename.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/adt/like.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/name.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/oidname.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/regexp.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/regproc.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/varchar.c | 8 |
8 files changed, 24 insertions, 24 deletions
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 9d719319d9a..0ad01eca1b7 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.11 1997/09/08 21:48:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.12 1997/10/25 01:10:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -124,7 +124,7 @@ char16out(char *s) result[1] = '\0'; } else - strNcpy(result, s, 16); + StrNCpy(result, s, 16); return (result); } @@ -282,7 +282,7 @@ char2out(uint16 s) { char *result = (char *) palloc(3); - strNcpy(result, (char *) &s, 2); + StrNCpy(result, (char *) &s, 3); return (result); } @@ -349,7 +349,7 @@ uint32 s; { char *result = (char *) palloc(5); - strNcpy(result, (char *) &s, 4); + StrNCpy(result, (char *) &s, 5); return (result); } @@ -421,7 +421,7 @@ char8out(char *s) result[1] = '\0'; } else - strNcpy(result, s, 8); + StrNCpy(result, s, 9); return (result); } diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c index e8bfba41c96..b618a3d6b8a 100644 --- a/src/backend/utils/adt/filename.c +++ b/src/backend/utils/adt/filename.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.10 1997/09/08 02:30:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.11 1997/10/25 01:10:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,7 +59,7 @@ filename_in(char *file) else { /* Someone else's directory */ - char name[16], + char name[17], *p; struct passwd *pw; int len; @@ -72,7 +72,7 @@ filename_in(char *file) else { len = (p - file) - 1; - strNcpy(name, file + 1, len); + StrNCpy(name, file + 1, len+1); } /* printf("name: %s\n"); */ if ((pw = getpwnam(name)) == NULL) @@ -102,7 +102,7 @@ filename_in(char *file) else { len = (p - file) - 1; - strNcpy(environment, file + 1, len); + StrNCpy(environment, file + 1, len+1); } envirp = getenv(environment); if (envirp) diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 4a758b0ba28..7886354e908 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -48,7 +48,7 @@ fixedlen_like(char *s, struct varlena * p, int charlen) /* be sure sterm is null-terminated */ sterm = (char *) palloc(charlen + 1); - strNcpy(sterm, s, charlen); + StrNCpy(sterm, s, charlen+1); /* * p is a text = varlena, not a string so we have to make a string @@ -150,7 +150,7 @@ textnlike(struct varlena * s, struct varlena * p) } -/* $Revision: 1.9 $ +/* $Revision: 1.10 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 977360cc954..fb281a3e4e3 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.9 1997/09/08 21:48:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.10 1997/10/25 01:10:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ namein(char *s) return (NULL); result = (NameData *) palloc(NAMEDATALEN); /* always keep it null-padded */ - strNcpy(result->data, s, NAMEDATALEN - 1); + StrNCpy(result->data, s, NAMEDATALEN); return (result); } @@ -159,7 +159,7 @@ namestrcpy(Name name, char *str) { if (!name || !str) return (-1); - strNcpy(name->data, str, NAMEDATALEN - 1); + StrNCpy(name->data, str, NAMEDATALEN); return (0); } diff --git a/src/backend/utils/adt/oidname.c b/src/backend/utils/adt/oidname.c index 09bee543f80..27d28a072ec 100644 --- a/src/backend/utils/adt/oidname.c +++ b/src/backend/utils/adt/oidname.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.8 1997/09/18 20:22:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.9 1997/10/25 01:10:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ oidnamein(char *inStr) oc->id = (Oid) pg_atoi(inStr, sizeof(Oid), ','); /* copy one less to ensure null-padding */ ++inptr; - strNcpy(oc->name.data, inptr, NAMEDATALEN - 1); + StrNCpy(oc->name.data, inptr, NAMEDATALEN); } else elog(WARN, "Bad input data for type oidname"); diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index b172cc6b486..21b34249bd4 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.10 1997/09/08 21:48:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.11 1997/10/25 01:10:44 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -189,7 +189,7 @@ fixedlen_regexeq(char *s, struct varlena * p, int charlen, int cflags) /* be sure sterm is null-terminated */ sterm = (char *) palloc(charlen + 1); - strNcpy(sterm, s, charlen); + StrNCpy(sterm, s, charlen+1); result = RE_compile_and_execute(p, sterm, cflags); diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index ea3a66fe05e..70c97e0833f 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.7 1997/09/08 02:30:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.8 1997/10/25 01:10:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -133,7 +133,7 @@ regprocout(RegProcedure proid) RelationGetTupleDescriptor(proc), &isnull); if (!isnull) { - strNcpy(result, s, 16); + StrNCpy(result, s, 16); break; } elog(FATAL, "regprocout: null procedure %d", proid); diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index a9977fa6414..9b2f4129c8b 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.10 1997/09/08 02:31:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.11 1997/10/25 01:10:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,7 +106,7 @@ bpcharout(char *s) { len = *(int32 *) s - 4; result = (char *) palloc(len + 1); - strNcpy(result, s + 4, len); /* these are blank-padded */ + StrNCpy(result, s + 4, len+1); /* these are blank-padded */ } return (result); } @@ -145,7 +145,7 @@ varcharin(char *s, int dummy, int typlen) result = (char *) palloc(typlen); *(int32 *) result = typlen; - strncpy(result + 4, s, len); + strncpy(result + 4, s, len+1); return (result); } @@ -166,7 +166,7 @@ varcharout(char *s) { len = *(int32 *) s - 4; result = (char *) palloc(len + 1); - strNcpy(result, s + 4, len); + StrNCpy(result, s + 4, len+1); } return (result); } |