diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-16 18:59:49 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-16 19:00:03 -0400 |
commit | ed88bcfb7c15029f9fc95ee2380759a9eb782d46 (patch) | |
tree | 11913b6937d91fa4ee49f312eb044abc38ae7c50 /src/udev/net | |
parent | 36f822c4bd077f9121757e24b6516e5c7ada63b5 (diff) |
Be more careful when checking for empty files
If we want to avoid reading a totally empty file, it seems better
to check after we have opened the file, not before.
Diffstat (limited to 'src/udev/net')
-rw-r--r-- | src/udev/net/link-config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 73243fa107..512885f9c8 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -153,11 +153,6 @@ static int load_link(link_config_ctx *ctx, const char *filename) { assert(ctx); assert(filename); - if (null_or_empty_path(filename)) { - log_debug("skipping empty file: %s", filename); - return 0; - } - file = fopen(filename, "re"); if (!file) { if (errno == ENOENT) @@ -166,6 +161,11 @@ static int load_link(link_config_ctx *ctx, const char *filename) { return -errno; } + if (null_or_empty_fd(fileno(file))) { + log_debug("Skipping empty file: %s", filename); + return 0; + } + link = new0(link_config, 1); if (!link) return log_oom(); |