~mdw
/
fwd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support re-reading config files on SIGHUP.
[fwd]
/
file.c
diff --git
a/file.c
b/file.c
index
300ac04
..
60a233d
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: file.c,v 1.
1 1999/07/26 23:33:32
mdw Exp $
+ * $Id: file.c,v 1.
4 2001/02/03 20:30:03
mdw Exp $
*
* File source and target
*
*
* File source and target
*
@@
-29,6
+29,15
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: file.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: file.c,v $
+ * Revision 1.4 2001/02/03 20:30:03 mdw
+ * Support re-reading config files on SIGHUP.
+ *
+ * Revision 1.3 1999/12/22 15:43:47 mdw
+ * Fix log messages.
+ *
+ * Revision 1.2 1999/10/22 22:47:13 mdw
+ * New (empty) endpoint method required.
+ *
* Revision 1.1 1999/07/26 23:33:32 mdw
* New sources and targets.
*
* Revision 1.1 1999/07/26 23:33:32 mdw
* New sources and targets.
*
@@
-142,7
+151,7
@@
static void fept_close(endpt *e)
/* --- Endpoint operations table --- */
/* --- Endpoint operations table --- */
-static endpt_ops fept_ops = { 0, fept_wclose, fept_close };
+static endpt_ops fept_ops = { 0,
0,
fept_wclose, fept_close };
/*----- General operations on sources and targets -------------------------*/
/*----- General operations on sources and targets -------------------------*/
@@
-435,7
+444,7
@@
static endpt *file_endpt(fdata *f, const char *desc)
if (fd != -1) {
if (fattr_apply(f->out.u.name, &f->fa)) {
if (fd != -1) {
if (fattr_apply(f->out.u.name, &f->fa)) {
- fw_log(-1, "[%s] couldn't apply file attributes: %s",
+ fw_log(-1, "[%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) {
desc, f->out.u.name, strerror(errno));
}
} else if ((fd = open(f->out.u.name, m & ~O_CREAT)) < 0) {
@@
-540,8
+549,7
@@
tidy:
static void fsource_destroy(source *s)
{
fsource *fs = (fsource *)s;
static void fsource_destroy(source *s)
{
fsource *fs = (fsource *)s;
-
- /* free(fs->s.desc); */
+ free(fs->s.desc);
file_destroy(&fs->f);
DESTROY(fs);
}
file_destroy(&fs->f);
DESTROY(fs);
}
@@
-596,7
+604,7
@@
static void ftarget_destroy(target *t)
{
ftarget *ft = (ftarget *)t;
file_destroy(&ft->f);
{
ftarget *ft = (ftarget *)t;
file_destroy(&ft->f);
- /* free(ft->t.desc); */
+ free(ft->t.desc);
DESTROY(ft);
}
DESTROY(ft);
}