diff options
Diffstat (limited to 'mount/swapon.c')
| -rw-r--r-- | mount/swapon.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mount/swapon.c b/mount/swapon.c index 55933b10..d89c6a96 100644 --- a/mount/swapon.c +++ b/mount/swapon.c @@ -135,11 +135,18 @@ read_proc_swaps(void) { /* skip the first line */ if (!fgets(line, sizeof(line), swaps)) { - warnx(_("%s: unexpected file format"), _PATH_PROC_SWAPS); + /* do not whine about an empty file */ + if (ferror(swaps)) + warn(_("%s: unexpected file format"), _PATH_PROC_SWAPS); fclose(swaps); return; } + /* make sure the first line is the header */ + if (line[0] != '\0' && strncmp(line, "Filename\t", 9)) + goto valid_first_line; + while (fgets(line, sizeof(line), swaps)) { + valid_first_line: /* * Cut the line "swap_device ... more info" after device. * This will fail with names with embedded spaces. |