Fix getcwd() warning

New versions glibc declare getcwd() with the warn_unused_result attribute.
This results in a warning because the updated mount helper was not
checking this return value.  This issue was fixed by checking the return
type and in the case of an error simply returning the passed dataset.
One possible, but unlikely, error would be having your cwd directory
unlinked while the mount command was running.

  cmd/mount_zfs/mount_zfs.c: In function ‘parse_dataset’:
  cmd/mount_zfs/mount_zfs.c:223:2: error: ignoring return value of
      ‘getcwd’, declared with attribute warn_unused_result
This commit is contained in:
Brian Behlendorf 2011-03-18 13:54:27 -07:00
parent 04516a45b2
commit ec49a5f0ec

View File

@ -220,7 +220,9 @@ parse_dataset(char *dataset)
char cwd[PATH_MAX]; char cwd[PATH_MAX];
int len; int len;
(void) getcwd(cwd, PATH_MAX); if (getcwd(cwd, PATH_MAX) == NULL)
return (dataset);
len = strlen(cwd); len = strlen(cwd);
/* Do not add one when cwd already ends in a trailing '/' */ /* Do not add one when cwd already ends in a trailing '/' */