diff options
| author | Russ Allbery <rra@stanford.edu> | 2013-03-27 15:19:54 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2013-03-27 15:19:54 -0700 |
| commit | 5df16adc5024c56e3d733741919954308b4d498a (patch) | |
| tree | 5f042adaaa988478ca271f41f9b272ef5a1b45b5 /client/file.c | |
| parent | 431c3b56a52b9fe3135ab4339bada13ed49bda92 (diff) | |
| parent | 6871bae8e26beadaff5035de56b4f70a78961dc9 (diff) | |
Merge tag 'upstream/1.0' into debian
Upstream version 1.0
Diffstat (limited to 'client/file.c')
| -rw-r--r-- | client/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/file.c b/client/file.c index 861da6a..511c995 100644 --- a/client/file.c +++ b/client/file.c @@ -2,7 +2,8 @@ * File handling for the wallet client. * * Written by Russ Allbery <rra@stanford.edu> - * Copyright 2007, 2008, 2010 Board of Trustees, Leland Stanford Jr. University + * Copyright 2007, 2008, 2010 + * The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. */ @@ -15,7 +16,6 @@ #include <sys/stat.h> #include <client/internal.h> -#include <util/concat.h> #include <util/messages.h> #include <util/xmalloc.h> @@ -82,8 +82,8 @@ write_file(const char *name, const void *data, size_t length) { char *temp, *backup; - temp = concat(name, ".new", (char *) 0); - backup = concat(name, ".bak", (char *) 0); + xasprintf(&temp, "%s.new", name); + xasprintf(&backup, "%s.bak", name); overwrite_file(temp, data, length); if (access(name, F_OK) == 0) { if (access(backup, F_OK) == 0) |