util/nvmutil: further improved errno handling
parent
b81b51f98b
commit
ff88cb1ac3
|
@ -109,20 +109,19 @@ main(int argc, char *argv[])
|
||||||
cmd = &cmd_copy;
|
cmd = &cmd_copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (errno != 0)
|
if ((strMac == NULL) && (cmd == NULL))
|
||||||
goto nvmutil_exit;
|
errno = EINVAL;
|
||||||
|
else if (readFromFile(&fd, gbe, FILENAME, flags, SIZE_8KB) != SIZE_8KB)
|
||||||
if (readFromFile(&fd, gbe, FILENAME, flags, SIZE_8KB) != SIZE_8KB)
|
|
||||||
goto nvmutil_exit;
|
goto nvmutil_exit;
|
||||||
else if (errno == ENOTDIR)
|
else if (errno == ENOTDIR)
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
|
||||||
if (strMac != NULL)
|
if (errno != 0)
|
||||||
|
goto nvmutil_exit;
|
||||||
|
else if (strMac != NULL)
|
||||||
setmac(strMac);
|
setmac(strMac);
|
||||||
else if (cmd != NULL)
|
else if (cmd != NULL)
|
||||||
(*cmd)();
|
(*cmd)();
|
||||||
else
|
|
||||||
errno = EINVAL;
|
|
||||||
|
|
||||||
if (gbeFileModified)
|
if (gbeFileModified)
|
||||||
writeGbeFile(&fd, FILENAME);
|
writeGbeFile(&fd, FILENAME);
|
||||||
|
|
Loading…
Reference in New Issue