diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-13 00:09:18 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-13 00:09:18 -0400 |
| commit | 5b6d08cd2992922b667564a49f19580f11676050 (patch) | |
| tree | 4104a4255eeb88e78da71477b5f7b129f9a1b599 /src/bin/psql/startup.c | |
| parent | a53dee43fe585e673658b01e7354892dcede957e (diff) | |
Add use of asprintf()
Add asprintf(), pg_asprintf(), and psprintf() to simplify string
allocation and composition. Replacement implementations taken from
NetBSD.
Reviewed-by: Álvaro Herrera <alvherre@2ndquadrant.com>
Reviewed-by: Asif Naeem <anaeem.it@gmail.com>
Diffstat (limited to 'src/bin/psql/startup.c')
| -rw-r--r-- | src/bin/psql/startup.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index dc06f667027..a45ec552f42 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -182,12 +182,8 @@ main(int argc, char *argv[]) if (options.username == NULL) password_prompt = pg_strdup(_("Password: ")); else - { - password_prompt = pg_malloc(strlen(_("Password for user %s: ")) - 2 + - strlen(options.username) + 1); - sprintf(password_prompt, _("Password for user %s: "), - options.username); - } + pg_asprintf(&password_prompt, _("Password for user %s: "), + options.username); if (pset.getPassword == TRI_YES) password = simple_prompt(password_prompt, 100, false); @@ -642,10 +638,8 @@ process_psqlrc_file(char *filename) #define R_OK 4 #endif - psqlrc_minor = pg_malloc(strlen(filename) + 1 + strlen(PG_VERSION) + 1); - sprintf(psqlrc_minor, "%s-%s", filename, PG_VERSION); - psqlrc_major = pg_malloc(strlen(filename) + 1 + strlen(PG_MAJORVERSION) + 1); - sprintf(psqlrc_major, "%s-%s", filename, PG_MAJORVERSION); + pg_asprintf(&psqlrc_minor, "%s-%s", filename, PG_VERSION); + pg_asprintf(&psqlrc_major, "%s-%s", filename, PG_MAJORVERSION); /* check for minor version first, then major, then no version */ if (access(psqlrc_minor, R_OK) == 0) |