| trap.c (277973) | trap.c (281718) |
|---|---|
| 1/*- 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Kenneth Almquist. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 22 unchanged lines hidden (view full) --- 31 */ 32 33#ifndef lint 34#if 0 35static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95"; 36#endif 37#endif /* not lint */ 38#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Kenneth Almquist. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 22 unchanged lines hidden (view full) --- 31 */ 32 33#ifndef lint 34#if 0 35static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95"; 36#endif 37#endif /* not lint */ 38#include <sys/cdefs.h> |
| 39__FBSDID("$FreeBSD: head/bin/sh/trap.c 277973 2015-01-31 13:53:29Z jilles $"); | 39__FBSDID("$FreeBSD: head/bin/sh/trap.c 281718 2015-04-18 23:49:57Z bdrewery $"); |
| 40 41#include <signal.h> 42#include <unistd.h> 43#include <stdlib.h> 44 45#include "shell.h" 46#include "main.h" 47#include "nodes.h" /* for other headers */ --- 130 unchanged lines hidden (view full) --- 178 } else { 179 out1fmt(" %d\n", signo); 180 } 181 } 182 } 183 return 0; 184 } 185 action = NULL; | 40 41#include <signal.h> 42#include <unistd.h> 43#include <stdlib.h> 44 45#include "shell.h" 46#include "main.h" 47#include "nodes.h" /* for other headers */ --- 130 unchanged lines hidden (view full) --- 178 } else { 179 out1fmt(" %d\n", signo); 180 } 181 } 182 } 183 return 0; 184 } 185 action = NULL; |
| 186 if (*argv && sigstring_to_signum(*argv) == -1) { | 186 if (*argv && !is_number(*argv)) { |
| 187 if (strcmp(*argv, "-") == 0) 188 argv++; 189 else { 190 action = *argv; 191 argv++; 192 } 193 } 194 for (; *argv; argv++) { --- 357 unchanged lines hidden --- | 187 if (strcmp(*argv, "-") == 0) 188 argv++; 189 else { 190 action = *argv; 191 argv++; 192 } 193 } 194 for (; *argv; argv++) { --- 357 unchanged lines hidden --- |