diff options
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/pgarch.c | 6 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index 2f798f40b3a..991a22191f9 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.28 2007/01/05 22:19:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.29 2007/02/10 14:58:54 petere Exp $ * *------------------------------------------------------------------------- */ @@ -429,14 +429,14 @@ pgarch_archiveXlog(char *xlog) case 'p': /* %p: relative path of source file */ sp++; - StrNCpy(dp, pathname, endp - dp); + strlcpy(dp, pathname, endp - dp); make_native_path(dp); dp += strlen(dp); break; case 'f': /* %f: filename of source file */ sp++; - StrNCpy(dp, xlog, endp - dp); + strlcpy(dp, xlog, endp - dp); dp += strlen(dp); break; case '%': diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 06d8f99a82b..6b3bea6eb5e 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.518 2007/02/08 15:46:04 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.519 2007/02/10 14:58:54 petere Exp $ * * NOTES * @@ -3828,7 +3828,7 @@ save_backend_variables(BackendParameters * param, Port *port, memcpy(¶m->port, port, sizeof(Port)); write_inheritable_socket(¶m->portsocket, port->sock, childPid); - StrNCpy(param->DataDir, DataDir, MAXPGPATH); + strlcpy(param->DataDir, DataDir, MAXPGPATH); memcpy(¶m->ListenSocket, &ListenSocket, sizeof(ListenSocket)); @@ -3859,14 +3859,14 @@ save_backend_variables(BackendParameters * param, Port *port, memcpy(¶m->syslogPipe, &syslogPipe, sizeof(syslogPipe)); - StrNCpy(param->my_exec_path, my_exec_path, MAXPGPATH); + strlcpy(param->my_exec_path, my_exec_path, MAXPGPATH); - StrNCpy(param->pkglib_path, pkglib_path, MAXPGPATH); + strlcpy(param->pkglib_path, pkglib_path, MAXPGPATH); - StrNCpy(param->ExtraOptions, ExtraOptions, MAXPGPATH); + strlcpy(param->ExtraOptions, ExtraOptions, MAXPGPATH); - StrNCpy(param->lc_collate, setlocale(LC_COLLATE, NULL), LOCALE_NAME_BUFLEN); - StrNCpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), LOCALE_NAME_BUFLEN); + strlcpy(param->lc_collate, setlocale(LC_COLLATE, NULL), LOCALE_NAME_BUFLEN); + strlcpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), LOCALE_NAME_BUFLEN); return true; } @@ -4060,11 +4060,11 @@ restore_backend_variables(BackendParameters * param, Port *port) memcpy(&syslogPipe, ¶m->syslogPipe, sizeof(syslogPipe)); - StrNCpy(my_exec_path, param->my_exec_path, MAXPGPATH); + strlcpy(my_exec_path, param->my_exec_path, MAXPGPATH); - StrNCpy(pkglib_path, param->pkglib_path, MAXPGPATH); + strlcpy(pkglib_path, param->pkglib_path, MAXPGPATH); - StrNCpy(ExtraOptions, param->ExtraOptions, MAXPGPATH); + strlcpy(ExtraOptions, param->ExtraOptions, MAXPGPATH); setlocale(LC_COLLATE, param->lc_collate); setlocale(LC_CTYPE, param->lc_ctype); |