diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-21 07:44:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-21 07:44:54 -0300 |
| commit | 1fc6b0207cc2f3cce33817706603caa41a9de24d (patch) | |
| tree | d2d812b76b08f42a002621f716dd5f3199c7ca7d /bin/setfacl/file.c | |
| parent | b8632c4f34175c7018be77059ab229e755eb67e0 (diff) | |
| parent | bc9e0dd07a76c4d7a1c6fcf21824ca2cecff2c6d (diff) | |
| download | FreeBSD-src-1fc6b0207cc2f3cce33817706603caa41a9de24d.zip FreeBSD-src-1fc6b0207cc2f3cce33817706603caa41a9de24d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'bin/setfacl/file.c')
| -rw-r--r-- | bin/setfacl/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c index e5e19a2..7499f1c 100644 --- a/bin/setfacl/file.c +++ b/bin/setfacl/file.c @@ -43,13 +43,12 @@ acl_t get_acl_from_file(const char *filename) { FILE *file; + size_t len; char buf[BUFSIZ+1]; if (filename == NULL) err(1, "(null) filename in get_acl_from_file()"); - bzero(&buf, sizeof(buf)); - if (strcmp(filename, "-") == 0) { if (have_stdin != 0) err(1, "cannot specify more than one stdin"); @@ -61,7 +60,8 @@ get_acl_from_file(const char *filename) err(1, "fopen() %s failed", filename); } - fread(buf, sizeof(buf) - 1, (size_t)1, file); + len = fread(buf, (size_t)1, sizeof(buf) - 1, file); + buf[len] = '\0'; if (ferror(file) != 0) { fclose(file); err(1, "error reading from %s", filename); |
