diff options
author | Peter Eisentraut | 2007-02-10 14:58:55 +0000 |
---|---|---|
committer | Peter Eisentraut | 2007-02-10 14:58:55 +0000 |
commit | c3fb1630a6fb4a5945c73902da35615792207579 (patch) | |
tree | d8c4c5d7848a8d0c54fad8cc0deb9c8892daefbe | |
parent | 7a698d6b806b35ecbf1a13b7206d67560f48e126 (diff) |
StrNCpy -> strlcpy (not complete)
-rw-r--r-- | src/backend/bootstrap/bootstrap.c | 2 | ||||
-rw-r--r-- | src/backend/libpq/crypt.c | 2 | ||||
-rw-r--r-- | src/backend/libpq/hba.c | 6 | ||||
-rw-r--r-- | src/backend/libpq/ip.c | 4 | ||||
-rw-r--r-- | src/backend/nodes/print.c | 8 | ||||
-rw-r--r-- | src/backend/postmaster/pgarch.c | 4 | ||||
-rw-r--r-- | src/backend/postmaster/postmaster.c | 18 | ||||
-rw-r--r-- | src/backend/tcop/postgres.c | 2 | ||||
-rw-r--r-- | src/backend/utils/misc/guc-file.l | 2 | ||||
-rw-r--r-- | src/bin/initdb/initdb.c | 2 | ||||
-rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 8 | ||||
-rw-r--r-- | src/bin/pg_dump/pg_dumpall.c | 2 | ||||
-rw-r--r-- | src/bin/pg_resetxlog/pg_resetxlog.c | 4 | ||||
-rw-r--r-- | src/interfaces/libpq/fe-auth.c | 2 | ||||
-rw-r--r-- | src/interfaces/libpq/fe-connect.c | 14 | ||||
-rw-r--r-- | src/timezone/pgtz.c | 4 |
16 files changed, 42 insertions, 42 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index fedde42c25..f06b725ab0 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -277,7 +277,7 @@ BootstrapMain(int argc, char *argv[]) SetConfigOption("fsync", "false", PGC_POSTMASTER, PGC_S_ARGV); break; case 'r': - StrNCpy(OutputFileName, optarg, MAXPGPATH); + strlcpy(OutputFileName, optarg, MAXPGPATH); break; case 'x': xlogop = atoi(optarg); diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index d537614c4c..aadb302828 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -110,7 +110,7 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass) { char salt[3]; - StrNCpy(salt, port->cryptSalt, 3); + strlcpy(salt, port->cryptSalt, sizeof(salt)); crypt_pwd = crypt(shadow_pass, salt); break; } diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 9c9e011330..71eabeb05f 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -1463,7 +1463,7 @@ ident_unix(int sock, char *ident_user) return false; } - StrNCpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); + strlcpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); return true; #elif defined(SO_PEERCRED) @@ -1493,7 +1493,7 @@ ident_unix(int sock, char *ident_user) return false; } - StrNCpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); + strlcpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); return true; #elif defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS)) @@ -1562,7 +1562,7 @@ ident_unix(int sock, char *ident_user) return false; } - StrNCpy(ident_user, pw->pw_name, IDENT_USERNAME_MAX + 1); + strlcpy(ident_user, pw->pw_name, IDENT_USERNAME_MAX + 1); return true; #else diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c index 1a68fedb92..0543fb0f76 100644 --- a/src/backend/libpq/ip.c +++ b/src/backend/libpq/ip.c @@ -175,9 +175,9 @@ pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen, if (rc != 0) { if (node) - StrNCpy(node, "???", nodelen); + strlcpy(node, "???", nodelen); if (service) - StrNCpy(service, "???", servicelen); + strlcpy(service, "???", servicelen); } return rc; diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index 9043ef7684..d1e4e64a73 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -574,28 +574,28 @@ print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label) RangeTblEntry *rte; rte = rt_fetch(((Scan *) p)->scanrelid, parsetree->rtable); - StrNCpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); + strlcpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); } else if (IsA(p, IndexScan)) { RangeTblEntry *rte; rte = rt_fetch(((IndexScan *) p)->scan.scanrelid, parsetree->rtable); - StrNCpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); + strlcpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); } else if (IsA(p, FunctionScan)) { RangeTblEntry *rte; rte = rt_fetch(((FunctionScan *) p)->scan.scanrelid, parsetree->rtable); - StrNCpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); + strlcpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); } else if (IsA(p, ValuesScan)) { RangeTblEntry *rte; rte = rt_fetch(((ValuesScan *) p)->scan.scanrelid, parsetree->rtable); - StrNCpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); + strlcpy(extraInfo, rte->eref->aliasname, NAMEDATALEN); } else extraInfo[0] = '\0'; diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index 638343a8b4..dbb6dd0244 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -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 ab2ca765f4..ad508b309b 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -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); diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index b2566dec41..c0ccfaef83 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -2846,7 +2846,7 @@ PostgresMain(int argc, char *argv[], const char *username) case 'r': /* send output (stdout and stderr) to the given file */ if (secure) - StrNCpy(OutputFileName, optarg, MAXPGPATH); + strlcpy(OutputFileName, optarg, MAXPGPATH); break; case 'S': diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index e0bbcef704..cc073f939e 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -218,7 +218,7 @@ ParseConfigFile(const char *config_file, const char *calling_file, if (!is_absolute_path(config_file)) { Assert(calling_file != NULL); - StrNCpy(abs_path, calling_file, MAXPGPATH); + strlcpy(abs_path, calling_file, sizeof(abs_path)); get_parent_directory(abs_path); join_path_components(abs_path, abs_path, config_file); canonicalize_path(abs_path); diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index a0472aa8e9..c9ccc76f19 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -2706,7 +2706,7 @@ main(int argc, char *argv[]) char full_path[MAXPGPATH]; if (find_my_exec(argv[0], full_path) < 0) - StrNCpy(full_path, progname, MAXPGPATH); + strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) fprintf(stderr, diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 1561e00afd..b16e6a18c0 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -416,7 +416,7 @@ test_postmaster_connection(void) /* advance past whitespace/quoting */ while (isspace((unsigned char) *p) || *p == '\'' || *p == '"') p++; - StrNCpy(portstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1, + strlcpy(portstr, p, Min(strcspn(p, "\"'" WHITESPACE) + 1, sizeof(portstr))); /* keep looking, maybe there is another -p */ } @@ -449,7 +449,7 @@ test_postmaster_connection(void) p++; while (isspace((unsigned char) *p)) p++; - StrNCpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1, + strlcpy(portstr, p, Min(strcspn(p, "#" WHITESPACE) + 1, sizeof(portstr))); /* keep looking, maybe there is another */ } @@ -458,7 +458,7 @@ test_postmaster_connection(void) /* environment */ if (!*portstr && getenv("PGPORT") != NULL) - StrNCpy(portstr, getenv("PGPORT"), sizeof(portstr)); + strlcpy(portstr, getenv("PGPORT"), sizeof(portstr)); /* default */ if (!*portstr) @@ -594,7 +594,7 @@ do_start(void) char full_path[MAXPGPATH]; if (find_my_exec(argv0, full_path) < 0) - StrNCpy(full_path, progname, MAXPGPATH); + strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) write_stderr(_("The program \"postgres\" is needed by %s " diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index de6231d73c..131cccb9e1 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -150,7 +150,7 @@ main(int argc, char *argv[]) char full_path[MAXPGPATH]; if (find_my_exec(argv[0], full_path) < 0) - StrNCpy(full_path, progname, MAXPGPATH); + strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) fprintf(stderr, diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index cd0fe70caf..90aa3e9d7a 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -498,14 +498,14 @@ GuessControlValues(void) fprintf(stderr, _("%s: invalid LC_COLLATE setting\n"), progname); exit(1); } - StrNCpy(ControlFile.lc_collate, localeptr, LOCALE_NAME_BUFLEN); + strlcpy(ControlFile.lc_collate, localeptr, sizeof(ControlFile.lc_collate)); localeptr = setlocale(LC_CTYPE, ""); if (!localeptr) { fprintf(stderr, _("%s: invalid LC_CTYPE setting\n"), progname); exit(1); } - StrNCpy(ControlFile.lc_ctype, localeptr, LOCALE_NAME_BUFLEN); + strlcpy(ControlFile.lc_ctype, localeptr, sizeof(ControlFile.lc_ctype)); /* * XXX eventually, should try to grovel through old XLOG to develop more diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 79a0fc4b51..20b04ba90c 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -418,7 +418,7 @@ pg_password_sendauth(PGconn *conn, const char *password, AuthRequest areq) { char salt[3]; - StrNCpy(salt, conn->cryptSalt, 3); + strlcpy(salt, conn->cryptSalt, sizeof(salt)); crypt_pwd = crypt(password, salt); break; } diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 82e1b4afbb..36f1c72fa3 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -2208,7 +2208,7 @@ internal_cancel(SockAddr *raddr, int be_pid, int be_key, */ if ((tmpsock = socket(raddr->addr.ss_family, SOCK_STREAM, 0)) < 0) { - StrNCpy(errbuf, "PQcancel() -- socket() failed: ", errbufsize); + strlcpy(errbuf, "PQcancel() -- socket() failed: ", errbufsize); goto cancel_errReturn; } retry3: @@ -2218,7 +2218,7 @@ retry3: if (SOCK_ERRNO == EINTR) /* Interrupted system call - we'll just try again */ goto retry3; - StrNCpy(errbuf, "PQcancel() -- connect() failed: ", errbufsize); + strlcpy(errbuf, "PQcancel() -- connect() failed: ", errbufsize); goto cancel_errReturn; } @@ -2239,7 +2239,7 @@ retry4: if (SOCK_ERRNO == EINTR) /* Interrupted system call - we'll just try again */ goto retry4; - StrNCpy(errbuf, "PQcancel() -- send() failed: ", errbufsize); + strlcpy(errbuf, "PQcancel() -- send() failed: ", errbufsize); goto cancel_errReturn; } @@ -2297,7 +2297,7 @@ PQcancel(PGcancel *cancel, char *errbuf, int errbufsize) { if (!cancel) { - StrNCpy(errbuf, "PQcancel() -- no cancel object supplied", errbufsize); + strlcpy(errbuf, "PQcancel() -- no cancel object supplied", errbufsize); return FALSE; } @@ -2328,7 +2328,7 @@ PQrequestCancel(PGconn *conn) if (conn->sock < 0) { - StrNCpy(conn->errorMessage.data, + strlcpy(conn->errorMessage.data, "PQrequestCancel() -- connection is not open\n", conn->errorMessage.maxlen); conn->errorMessage.len = strlen(conn->errorMessage.data); @@ -3609,7 +3609,7 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username) if ((passfile_env = getenv("PGPASSFILE")) != NULL) /* use the literal path from the environment, if set */ - StrNCpy(pgpassfile, passfile_env, MAXPGPATH); + strlcpy(pgpassfile, passfile_env, sizeof(pgpassfile)); else { char homedir[MAXPGPATH]; @@ -3700,7 +3700,7 @@ pqGetHomeDirectory(char *buf, int bufsize) if (pqGetpwuid(geteuid(), &pwdstr, pwdbuf, sizeof(pwdbuf), &pwd) != 0) return false; - StrNCpy(buf, pwd->pw_dir, bufsize); + strlcpy(buf, pwd->pw_dir, bufsize); return true; #else char tmppath[MAX_PATH]; diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index dc97f2c2b2..0828ddac8b 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -566,7 +566,7 @@ scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry * tt, if (score > *bestscore) { *bestscore = score; - StrNCpy(bestzonename, tzdirsub, TZ_STRLEN_MAX + 1); + strlcpy(bestzonename, tzdirsub, TZ_STRLEN_MAX + 1); } else if (score == *bestscore) { @@ -574,7 +574,7 @@ scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry * tt, if (strlen(tzdirsub) < strlen(bestzonename) || (strlen(tzdirsub) == strlen(bestzonename) && strcmp(tzdirsub, bestzonename) < 0)) - StrNCpy(bestzonename, tzdirsub, TZ_STRLEN_MAX + 1); + strlcpy(bestzonename, tzdirsub, TZ_STRLEN_MAX + 1); } } |