Skip to content

Commit

Permalink
Make command line guid parsing more tolerant
Browse files Browse the repository at this point in the history
Several of the zfs utilities allow you to pass a vdev's guid rather
than the device name.  However, the utilities are not consistent in
how they parse that guid.  For example, 'zinject' expects the guid
to be passed as a hex value while 'zpool replace' wants it as a
decimal.  The user is forced to just know what format to use.

This patch improve things by making the parsing more tolerant.
When strtol(3) is called using 0 for the base, rather than say
10 or 16, it will then accept hex, decimal, or octal input based
on the prefix.  From the man page.

    If base is zero or 16, the string may then include a "0x"
    prefix, and  the number  will  be read in base 16; otherwise,
    a zero base is taken as 10 (decimal) unless the next character
    is '0', in which case it  is  taken as 8 (octal).

NOTE: There may be additional conversions not caught be this patch.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Chris Dunlap <cdunlap@llnl.gov>
Issue #2
  • Loading branch information
behlendorf committed Apr 2, 2014
1 parent 11a7043 commit 1a5c611
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/zinject/translate.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ translate_device(const char *pool, const char *device, err_type_t label_type,
if ((zhp = zpool_open(g_zfs, pool)) == NULL)
return (-1);

record->zi_guid = strtoull(device, &end, 16);
record->zi_guid = strtoull(device, &end, 0);
if (record->zi_guid == 0 || *end != '\0') {
tgt = zpool_find_vdev(zhp, device, &isspare, &iscache, NULL);

Expand Down
2 changes: 1 addition & 1 deletion lib/libzfs/libzfs_pool.c
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,7 @@ zpool_find_vdev(zpool_handle_t *zhp, const char *path, boolean_t *avail_spare,

verify(nvlist_alloc(&search, NV_UNIQUE_NAME, KM_SLEEP) == 0);

guid = strtoull(path, &end, 10);
guid = strtoull(path, &end, 0);
if (guid != 0 && *end == '\0') {
verify(nvlist_add_uint64(search, ZPOOL_CONFIG_GUID, guid) == 0);
} else if (zpool_vdev_is_interior(path)) {
Expand Down

0 comments on commit 1a5c611

Please sign in to comment.