diff options
author | Bruce Momjian <bruce@momjian.us> | 2001-11-08 20:37:52 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2001-11-08 20:37:52 +0000 |
commit | 77e4fd889c0a0e374164c2b57cade1ab2384d3f3 (patch) | |
tree | ca23ee21fba96421dad466734321daeeea1c4beb /src/backend/port/darwin/system.c | |
parent | e8192dc0d037d30281369259b31b32330609ad30 (diff) | |
download | postgresql-77e4fd889c0a0e374164c2b57cade1ab2384d3f3.tar.gz postgresql-77e4fd889c0a0e374164c2b57cade1ab2384d3f3.zip |
Fix indenting for 'extern "C"' cases.
Diffstat (limited to 'src/backend/port/darwin/system.c')
-rw-r--r-- | src/backend/port/darwin/system.c | 94 |
1 files changed, 50 insertions, 44 deletions
diff --git a/src/backend/port/darwin/system.c b/src/backend/port/darwin/system.c index 23a548a1116..f66782eb363 100644 --- a/src/backend/port/darwin/system.c +++ b/src/backend/port/darwin/system.c @@ -6,22 +6,22 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: + * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -35,7 +35,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)system.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ +#endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <sys/wait.h> @@ -46,51 +46,57 @@ static char sccsid[] = "@(#)system.c 8.1 (Berkeley) 6/4/93"; #include <paths.h> #include <errno.h> -int system(const char *command); +int system(const char *command); int system(const char *command) { - pid_t pid; - int pstat; - struct sigaction ign, intact, quitact; - sigset_t newsigblock, oldsigblock; + pid_t pid; + int pstat; + struct sigaction ign, + intact, + quitact; + sigset_t newsigblock, + oldsigblock; - if (!command) /* just checking... */ - return(1); + if (!command) /* just checking... */ + return (1); /* - * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save - * existing signal dispositions. + * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save existing + * signal dispositions. */ ign.sa_handler = SIG_IGN; - (void)sigemptyset(&ign.sa_mask); + (void) sigemptyset(&ign.sa_mask); ign.sa_flags = 0; - (void)sigaction(SIGINT, &ign, &intact); - (void)sigaction(SIGQUIT, &ign, &quitact); - (void)sigemptyset(&newsigblock); - (void)sigaddset(&newsigblock, SIGCHLD); - (void)sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); - switch(pid = fork()) { - case -1: /* error */ - break; - case 0: /* child */ - /* - * Restore original signal dispositions and exec the command. - */ - (void)sigaction(SIGINT, &intact, NULL); - (void)sigaction(SIGQUIT, &quitact, NULL); - (void)sigprocmask(SIG_SETMASK, &oldsigblock, NULL); - execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL); - _exit(127); - default: /* parent */ - do { - pid = wait4(pid, &pstat, 0, (struct rusage *)0); - } while (pid == -1 && errno == EINTR); - break; + (void) sigaction(SIGINT, &ign, &intact); + (void) sigaction(SIGQUIT, &ign, &quitact); + (void) sigemptyset(&newsigblock); + (void) sigaddset(&newsigblock, SIGCHLD); + (void) sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); + switch (pid = fork()) + { + case -1: /* error */ + break; + case 0: /* child */ + + /* + * Restore original signal dispositions and exec the command. + */ + (void) sigaction(SIGINT, &intact, NULL); + (void) sigaction(SIGQUIT, &quitact, NULL); + (void) sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execl(_PATH_BSHELL, "sh", "-c", command, (char *) NULL); + _exit(127); + default: /* parent */ + do + { + pid = wait4(pid, &pstat, 0, (struct rusage *) 0); + } while (pid == -1 && errno == EINTR); + break; } - (void)sigaction(SIGINT, &intact, NULL); - (void)sigaction(SIGQUIT, &quitact, NULL); - (void)sigprocmask(SIG_SETMASK, &oldsigblock, NULL); - return(pid == -1 ? -1 : pstat); + (void) sigaction(SIGINT, &intact, NULL); + (void) sigaction(SIGQUIT, &quitact, NULL); + (void) sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + return (pid == -1 ? -1 : pstat); } |