X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/fwd/blobdiff_plain/a320e3007ae90a67742bcb4eafda9ef8e539f04b..d935f68b3915cbf8ce604b7ead06210ce7d933e0:/file.c diff --git a/file.c b/file.c index 88b7666..8b4f533 100644 --- a/file.c +++ b/file.c @@ -140,7 +140,7 @@ static reffd *file_nullref(void) else { int n; if ((n = open("/dev/null", O_RDWR)) < 0) { - fw_log(-1, "couldn't open `/dev/null': %s", strerror(errno)); + fw_log(NOW, "couldn't open `/dev/null': %s", strerror(errno)); return (0); } fdflags(n, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC); @@ -359,7 +359,7 @@ static endpt *file_endpt(fdata *f, const char *desc) case FTYPE_NAME: { int fd; if ((fd = open(f->in.u.name, O_RDONLY | O_NONBLOCK)) < 0) { - fw_log(-1, "[%s] couldn't open `%s' for reading: %s", + fw_log(NOW, "[%s] couldn't open `%s' for reading: %s", desc, f->in.u.name, strerror(errno)); return (0); } @@ -391,7 +391,7 @@ static endpt *file_endpt(fdata *f, const char *desc) if ((m & O_CREAT) && (fd = open(f->out.u.name, m | O_EXCL, f->fa.mode)) < 0 && (errno != EEXIST || (m & O_EXCL))) { - fw_log(-1, "[%s] couldn't create `%s': %s", + fw_log(NOW, "[%s] couldn't create `%s': %s", desc, f->out.u.name, strerror(errno)); REFFD_DEC(in); return (0); @@ -399,11 +399,11 @@ static endpt *file_endpt(fdata *f, const char *desc) if (fd != -1) { if (fattr_apply(f->out.u.name, &f->fa)) { - fw_log(-1, "[%s] couldn't apply file attributes to `%s': %s", + fw_log(NOW, "[%s] couldn't apply file attributes to `%s': %s", desc, f->out.u.name, strerror(errno)); } } else if ((fd = open(f->out.u.name, m & ~O_CREAT)) < 0) { - fw_log(-1, "[%s] couldn't open `%s': %s", + fw_log(NOW, "[%s] couldn't open `%s': %s", desc, f->out.u.name, strerror(errno)); REFFD_DEC(in); return (0);