diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-12-27 13:54:37 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-12-27 13:54:37 +0000 |
| commit | 6ce8fe0537b34abd5e12fd9455f992c2da9e924b (patch) | |
| tree | 10b0f87d6c6a17d98dbdd1089cb3f4d0f9327ddb /compat/getdtablecount.c | |
| parent | e19df0e86994c6c63c2be413a039ba9a2f03301d (diff) | |
| download | rtmux-6ce8fe0537b34abd5e12fd9455f992c2da9e924b.tar.gz rtmux-6ce8fe0537b34abd5e12fd9455f992c2da9e924b.tar.bz2 rtmux-6ce8fe0537b34abd5e12fd9455f992c2da9e924b.zip | |
Still need to globfree on failure.
Diffstat (limited to 'compat/getdtablecount.c')
| -rw-r--r-- | compat/getdtablecount.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/compat/getdtablecount.c b/compat/getdtablecount.c index 3ccab650..1f9a0aa7 100644 --- a/compat/getdtablecount.c +++ b/compat/getdtablecount.c @@ -30,19 +30,12 @@ getdtablecount(void) { char path[PATH_MAX]; glob_t g; - int n; + int n = 0; if (snprintf(path, sizeof path, "/proc/%ld/fd/*", (long)getpid()) < 0) fatal("snprintf overflow"); - switch (glob(path, 0, NULL, &g)) { - case GLOB_NOMATCH: - return (0); - case 0: - break; - default: - fatal("glob(\"%s\") failed", path); - } - n = g.gl_pathc; + if (glob(path, 0, NULL, &g) == 0) + n = g.gl_pathc; globfree(&g); return (n); } |