20c20
< * must display the following acknowledgement:
---
> * must display the following acknowledgment:
41c41
< * $Id: hlfsd.c,v 1.2 1998/08/23 22:52:08 obrien Exp $
---
> * $Id: hlfsd.c,v 1.3 1998/11/14 03:13:31 obrien Exp $
85a86
> #if 0
86a88,89
> int foreground = 1; /* This is the top-level server */
> #endif
90d92
< int foreground = 1; /* This is the top-level server */
94c96
< int orig_umask;
---
> int orig_umask = 022;
96a99
> #if 0
97a101
> #endif
107a112
> #if 0
110a116
> #endif
121c127
< progname);
---
> am_get_progname());
139a146
> char *progname;
173a181
> am_set_progname(progname);
175c183
< while ((opt = getopt(argc, argv, "a:c:CD:fg:hi:l:no:pP:x:v")) != EOF)
---
> while ((opt = getopt(argc, argv, "a:c:CD:fg:hi:l:no:pP:x:v")) != -1)
181c189
< progname, optarg);
---
> am_get_progname(), optarg);
190c198
< progname, optarg);
---
> am_get_progname(), optarg);
211c219
< progname, optarg);
---
> am_get_progname(), optarg);
250c258
< fprintf(stderr, "%s: not compiled with DEBUG -- sorry.\n", progname);
---
> fprintf(stderr, "%s: not compiled with DEBUG -- sorry.\n", am_get_progname());
263c271
< mypid = getpid();
---
> am_set_mypid();
274c282
< fprintf(stderr, "%s: will not be able to turn off attribute caches.\n", progname);
---
> fprintf(stderr, "%s: will not be able to turn off attribute caches.\n", am_get_progname());
305c313
< progname, hlfs_group);
---
> am_get_progname(), hlfs_group);
315,316d322
< if (logfile)
< switch_to_logfile(logfile);
317a324,325
> if (logfile)
> switch_to_logfile(logfile, orig_umask);
342c350
< progname, dir_name);
---
> am_get_progname(), dir_name);
357c365
< progname, dir_name);
---
> am_get_progname(), dir_name);
375c383
< progname, dir_name, direntry->d_name);
---
> am_get_progname(), dir_name, direntry->d_name);
384c392
< progname);
---
> am_get_progname());
396c404
< progname, dir_name);
---
> am_get_progname(), dir_name);
405c413
< progname, dir_name);
---
> am_get_progname(), dir_name);
520c528
< sprintf(progpid_fs, "%s:%d", progname, masterpid);
---
> sprintf(progpid_fs, "%s:%d", am_get_progname(), masterpid);
596c604
< mypid = getpid();
---
> am_set_mypid();
673c681
< mypid = getpid(); /* for logging routines */
---
> am_set_mypid(); /* for logging routines */
686c694
< masterpid = serverpid = mypid = getpid(); /* for logging routines */
---
> masterpid = serverpid = am_set_mypid(); /* for logging routines */
719c727
< * SIGCHLD: interlock sycronization and testing
---
> * SIGCHLD: interlock synchronization and testing
810c818
< switch_to_logfile(logfile);
---
> switch_to_logfile(logfile, orig_umask);
818c826
< mypid = getpid();
---
> am_set_mypid();
842c850
< mypid = getpid();
---
> am_set_mypid();
866c874
< mypid = getpid();
---
> am_set_mypid();
869c877
< mypid = getpid();
---
> am_set_mypid();
881c889
< kill(mypid, SIGSTOP);
---
> kill(am_mypid, SIGSTOP);
917c925
< int mypid = getpid();
---
> int mypid = getpid(); /* XXX: should this be the global am_mypid */
938c946
< fprintf(stderr, "%s: %s\n", progname, mess);
---
> fprintf(stderr, "%s: %s\n", am_get_progname(), mess);
944c952
< fprintf(stderr, "%s: %s: %s\n", progname,
---
> fprintf(stderr, "%s: %s: %s\n", am_get_progname(),
948c956
< progname, lessmess, errno);
---
> am_get_progname(), lessmess, errno);