From ab53132154320a2863ab899457aacbd5e1092372 Mon Sep 17 00:00:00 2001 From: Jesse Smith Date: Tue, 17 Nov 2020 20:31:37 -0400 Subject: [PATCH] Removed old original source file that was left behind by patch action. Fixed typos in source code, comments, manual pages, and changelog. Corrections provided by Jens Schleusener of FOSSIES (fossies.org). --- README | 2 +- contrib/alexander.viro | 2 +- doc/Changelog | 32 ++++++++++++++++---------------- doc/initctl | 2 +- man/fstab-decode.8 | 2 +- man/initctl.5 | 2 +- src/consoles.c | 2 +- src/ifdown.c | 2 +- src/init.c | 4 ++-- src/initreq.h | 2 +- src/killall5.c | 2 +- src/set.h | 2 +- src/shutdown.c | 2 +- src/sulogin.c | 2 +- src/wall.c | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README b/README index 97aaf67..f5d7b89 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ README for SysV init ==================== -SysV init is a classic initilization program (PID 1) for GNU/Linux and +SysV init is a classic initialization program (PID 1) for GNU/Linux and other UNIX/POSIX systems. It is designed to be small, simple and to stay out of the way. diff --git a/contrib/alexander.viro b/contrib/alexander.viro index 976d09b..0ded667 100644 --- a/contrib/alexander.viro +++ b/contrib/alexander.viro @@ -1,4 +1,4 @@ -I proposed moving some stuff to a seperate file, such as the +I proposed moving some stuff to a separate file, such as the re-exec routines. Alexander wrote: diff --git a/doc/Changelog b/doc/Changelog index 0c0a936..0096934 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,7 +1,7 @@ sysvinit (2.98) released; urgency=low * Fixed time parsing in shutdown when there is a + in front of a 0 time offset. - Commands with a postiive time offset (+1) would work but +0 fails. + Commands with a positive time offset (+1) would work but +0 fails. This has been corrected by Arkadiusz Miskiewicz. sysvinit (2.97) released; urgency=low @@ -30,8 +30,8 @@ sysvinit (2.96) released; urgency=low [ Jesse Smith ] - * Added -z command line paramter to pidof which tells pidof to - try to find processes in uninterruptable (D) or zombie (Z) states. + * Added -z command line parameter to pidof which tells pidof to + try to find processes in uninterruptible (D) or zombie (Z) states. This can cause pidof to hang, but produces a more complete process list. Closes Savannah bug #56534 @@ -89,7 +89,7 @@ sysvinit (2.94) released; urgency=low shutting down procedure, it should cause the system to be powered off. If halt is called without -p then the value of INIT_HALT - is not set and the default action (often set in /etc/defaut/halt) + is not set and the default action (often set in /etc/default/halt) is taken. * Removed unnecessary malloc.h includes. Memory allocation and freeing is now handled in stdlib.h @@ -175,7 +175,7 @@ sysvinit (2.92) released; urgency=low * Removed typos from pidof manual page and killall5 page. Closes Debian bugs #815839, #905245 and #890478 * Added -f option to pidof program to allow printf - style formating. + style formatting. Closes Debian bug #571590 Thanks to Philipp Marek for the patch. * Added new tool (readbootlog) which will read the /var/log/boot file @@ -365,7 +365,7 @@ sysvinit (2.89) world; urgency=low This should close Savannah bug report 36528. http://savannah.nongnu.org/bugs/?36528 * Applied patches provided in Savannah bug report 49991. Fix tabs in - bootlogd and avoid printing unitialized "buf" variable when + bootlogd and avoid printing uninitialized "buf" variable when consolename() fails. [ Werner Fink ] @@ -374,7 +374,7 @@ sysvinit (2.89) world; urgency=low * Handle deleted binaries in pidof (was local bug #34992) * Allow init to delete extra environment variables (was local bug #35858) - * Avoid that init double environment variables for its childs + * Avoid that init double environment variables for its children (was local bug #35855) * Remove man-db tag for encoding for canonical man * Sulogin: try to detect the real device(s) used for the system console @@ -493,7 +493,7 @@ sysvinit (2.88dsf) world; urgency=low to disk using fdatasync(). Patch from Scott Gifford via Debian. * Add compatibility code to handle old path "/etc/powerstatus" for a while. - * Incude definition for MNT_DETACH which is missing in older GNU libc + * Include definition for MNT_DETACH which is missing in older GNU libc headers. * Do not strip binaries before installing them, to make it easier to get binaries with debug information installed. @@ -522,8 +522,8 @@ sysvinit (2.88dsf) world; urgency=low * pidof - provide '-n' to skip stat(2) syscall on network based FS. * init - avoid compiler warnings * init - initialize console by using the macros from ttydefaults.h - * init - add the possiblity to ignore further interrupts from keyboard - * init - add the possiblity to set sane terminal line settings + * init - add the possibility to ignore further interrupts from keyboard + * init - add the possibility to set sane terminal line settings * sulogin - add the possibility to reset the terminal io * Fix some minor problems * init - enable is_selinux_enabled() to detect selinuxfs @@ -539,7 +539,7 @@ sysvinit (2.88dsf) world; urgency=low #68621, which will add PAM support for programs spawned by init on the console like sulogin. Based on patch by Topi Miettinen. This patch is not applied by default yet while we review its - usefullness. It is only helpful for session handling, as sulogin + usefulness. It is only helpful for session handling, as sulogin do not use and will not use a PAM conv() function. The current sulogin is able to handle DES as well as MD5, SHA, and Blowfish encrypted passwords due using getpwnam(3). @@ -547,7 +547,7 @@ sysvinit (2.88dsf) world; urgency=low use the correct pid even on a controlling tty * Remaining problem is that the pid of the second fork() for getting a controlling tty isn't that reported by spawn() - * Re-enable writting utmp/wtmp for boot scripts + * Re-enable writing utmp/wtmp for boot scripts * Extend sulogin to support additional encryption algorithms * Re-enable maintenance message of sulogin * Enable the sulogin fallback password check to handle MD5, SHA, and @@ -639,7 +639,7 @@ sysvinit (2.87dsf) world; urgency=low and document this requirement in the manual page. * Change reboot/halt to work properly when used as a login shell. Patch by Dale R. Worley and Fedora. - * Let sulogin fall back to the staticly linked /bin/sash if both roots + * Let sulogin fall back to the statically linked /bin/sash if both roots shell and /bin/sh fail to execute. -- Petter Reinholdtsen Sun, 12 Jul 2009 19:58:10 +0200 @@ -647,11 +647,11 @@ sysvinit (2.87dsf) world; urgency=low sysvinit (2.86) cistron; urgency=low * Fixed up bootlogd to read /proc/cmdline. Also keep an internal - linebuffer to process \r, \t and ^H. It is becoming useable. + linebuffer to process \r, \t and ^H. It is becoming usable. * Applied trivial OWL patches * Block signals in syslog(), since syslog() is not re-entrant (James Olin Oden , redhat bug #97534) - * Minor adjustements so that sysvinit compiles on the Hurd + * Minor adjustments so that sysvinit compiles on the Hurd * killall5 now skips kernel threads * Inittab entries with both 'S' and other runlevels were broken. Fix by Bryan Kadzban @@ -880,7 +880,7 @@ sysvinit (2.73-1) unstable; urgency=low * Use siginterrupt, now that system calls are restarted by default. Main symptom was that the sulogin timeout didn't work but there might have been more hidden problems. - * Kill process immidiately if turned off in inittab + * Kill process immediately if turned off in inittab * Fixed sulogin check on tty arg. * Use strerror() instead of sys_errlist * wall now supports a '-n' option to suppress [most of] the banner. diff --git a/doc/initctl b/doc/initctl index 734ca74..2e55f29 100644 --- a/doc/initctl +++ b/doc/initctl @@ -13,7 +13,7 @@ is presented here: /* * Because of legacy interfaces, "runlevel" and "sleeptime" - * aren't in a seperate struct in the union. + * aren't in a separate struct in the union. * * The weird sizes are because init expects the whole * struct to be 384 bytes. diff --git a/man/fstab-decode.8 b/man/fstab-decode.8 index 8710541..a962c7b 100644 --- a/man/fstab-decode.8 +++ b/man/fstab-decode.8 @@ -35,7 +35,7 @@ The argument escaping uses the same rules as path escaping in and \fB/proc/mtab\fR. In essence fstab-decode can be used anytime we want to pass multiple -parameters to a command as a list of command line argments. It turns output +parameters to a command as a list of command line arguments. It turns output like this: .nf diff --git a/man/initctl.5 b/man/initctl.5 index 5985df9..5a9bdc6 100644 --- a/man/initctl.5 +++ b/man/initctl.5 @@ -36,7 +36,7 @@ is presented here: /* * Because of legacy interfaces, "runlevel" and "sleeptime" - * aren't in a seperate struct in the union. + * aren't in a separate struct in the union. * * The weird sizes are because init expects the whole * struct to be 384 bytes. diff --git a/src/consoles.c b/src/consoles.c index f5e8732..d4972c8 100644 --- a/src/consoles.c +++ b/src/consoles.c @@ -142,7 +142,7 @@ err: #endif /* __linux__ */ /* - * Search below /dev for the characer device in + * Search below /dev for the character device in * the local `dev_t comparedev' variable. */ static dev_t comparedev; diff --git a/src/ifdown.c b/src/ifdown.c index d0ffe64..3884db3 100644 --- a/src/ifdown.c +++ b/src/ifdown.c @@ -58,7 +58,7 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; * First, we find all shaper devices and down them. Then we * down all real interfaces. This is because the comment in the * shaper driver says "if you down the shaper device before the - * attached inerface your computer will follow". + * attached interface your computer will follow". */ int ifdown(void) { diff --git a/src/init.c b/src/init.c index 78ae760..16d45c3 100644 --- a/src/init.c +++ b/src/init.c @@ -541,7 +541,7 @@ int receive_state(int fd) __attribute__ ((format (printf, 1, 2))) #endif #endif -/* This function already exists on FreeBSD. No need to delcare it. */ +/* This function already exists on FreeBSD. No need to declare it. */ #ifndef __FreeBSD__ static int setproctitle(char *fmt, ...) { @@ -737,7 +737,7 @@ void coredump(void) /* * OOPS: segmentation violation! - * If we have the info, print where it occured. + * If we have the info, print where it occurred. * Then sleep 30 seconds and try to continue. */ static diff --git a/src/initreq.h b/src/initreq.h index ee8a355..25b070e 100644 --- a/src/initreq.h +++ b/src/initreq.h @@ -63,7 +63,7 @@ struct init_request_bsd { /* * Because of legacy interfaces, "runlevel" and "sleeptime" - * aren't in a seperate struct in the union. + * aren't in a separate struct in the union. * * The weird sizes are because init expects the whole * struct to be 384 bytes. diff --git a/src/killall5.c b/src/killall5.c index ab05585..22d29dc 100644 --- a/src/killall5.c +++ b/src/killall5.c @@ -14,7 +14,7 @@ * * Riku Meskanen, * - return all running pids of given program name - * - single shot '-s' option for backwards combatibility + * - single shot '-s' option for backwards compatibility * - omit pid '-o' option and %PPID (parent pid metavariable) * - syslog() only if not a connected to controlling terminal * - swapped out programs pids are caught now diff --git a/src/set.h b/src/set.h index 724c35f..e5a5d67 100644 --- a/src/set.h +++ b/src/set.h @@ -1,7 +1,7 @@ /* * set.h Macros that look like sigaddset et al. but * aren't. They are used to manipulate bits in - * an integer, to do our signal bookeeping. + * an integer, to do our signal bookkeeping. * * Copyright (C) 2005 Miquel van Smoorenburg. * diff --git a/src/shutdown.c b/src/shutdown.c index 86d42f6..89b63a5 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -811,7 +811,7 @@ int main(int argc, char **argv) /* Rather than loop and reduce wt (wait time) once per minute, we shall check the current time against the target time. - Then calculate the remaining wating time based on the difference + Then calculate the remaining waiting time based on the difference between current time and target time. This avoids missing shutdown time (target time) after the computer has been asleep. -- Jesse diff --git a/src/sulogin.c b/src/sulogin.c index 4200f8e..211eb62 100644 --- a/src/sulogin.c +++ b/src/sulogin.c @@ -790,7 +790,7 @@ void sushell(struct passwd *pwd) execl(BINSH, profile ? "-sh" : "sh", NULL); perror(BINSH); - /* Fall back to staticly linked shell if both the users shell + /* Fall back to statically linked shell if both the users shell and /bin/sh failed to execute. */ setenv("SHELL", STATICSH, 1); execl(STATICSH, STATICSH, NULL); diff --git a/src/wall.c b/src/wall.c index d3a2c70..e527613 100644 --- a/src/wall.c +++ b/src/wall.c @@ -68,7 +68,7 @@ int main(int argc, char **argv) * we are root or if we're NOT setgid. */ if (geteuid() != 0 && getgid() != getegid()) { - fprintf(stderr, "wall -n: not priviliged\n"); + fprintf(stderr, "wall -n: not privileged\n"); exit(1); } remote = 1;