diff options
| author | Goffredo Baroncelli <kreijack@gmail.com> | 2014-12-17 21:14:09 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-06-08 17:50:46 +0200 |
| commit | f8a0b85e382ed0f76fd67f65ba5c5697a8468525 (patch) | |
| tree | 3266ce0d837bad7e49c92f5a6b4e3b92d4ba8078 /mkfs.c | |
| parent | b96345c7ff452fe0b37a503d16072fdebf96d2fd (diff) | |
btrfs-progs: return the fsid from make_btrfs()
The function make_btrfs() has as argument the fsid of the filesystem.
If this fsid is empty or null make_btrfs() generates a new fsid. However
If the buffer is valid (but the string is empty) the generated fsid is
copied back to the caller.
Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
Reviewed-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'mkfs.c')
| -rw-r--r-- | mkfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1142,7 +1142,7 @@ int main(int ac, char **av) int dev_cnt = 0; int saved_optind; char estr[100]; - char *fs_uuid = NULL; + char fs_uuid[BTRFS_UUID_UNPARSED_SIZE] = { 0 }; u64 features = BTRFS_MKFS_DEFAULT_FEATURES; while(1) { @@ -1235,7 +1235,8 @@ int main(int ac, char **av) source_dir_set = 1; break; case 'U': - fs_uuid = optarg; + strncpy(fs_uuid, optarg, + BTRFS_UUID_UNPARSED_SIZE - 1); break; case 'K': discard = 0; @@ -1261,7 +1262,7 @@ int main(int ac, char **av) exit(1); } - if (fs_uuid) { + if (*fs_uuid) { uuid_t dummy_uuid; if (uuid_parse(fs_uuid, dummy_uuid) != 0) { |