| fmt.c (97846) | fmt.c (97847) |
|---|---|
| 1/*- 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 19 unchanged lines hidden (view full) --- 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34#include <sys/cdefs.h> 35 | 1/*- 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 19 unchanged lines hidden (view full) --- 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34#include <sys/cdefs.h> 35 |
| 36__FBSDID("$FreeBSD: head/bin/ps/fmt.c 97846 2002-06-05 01:33:54Z jmallett $"); | 36__FBSDID("$FreeBSD: head/bin/ps/fmt.c 97847 2002-06-05 01:36:30Z jmallett $"); |
| 37 38#if 0 39#ifndef lint 40static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; 41#endif 42#endif 43 44#include <sys/types.h> --- 75 unchanged lines hidden (view full) --- 120 ap = NULL; 121 len = maxlen + 3; 122 } else { 123 ap = shquote(argv); 124 len = strlen(ap) + maxlen + 4; 125 } 126 cp = malloc(len); 127 if (cp == NULL) | 37 38#if 0 39#ifndef lint 40static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; 41#endif 42#endif 43 44#include <sys/types.h> --- 75 unchanged lines hidden (view full) --- 120 ap = NULL; 121 len = maxlen + 3; 122 } else { 123 ap = shquote(argv); 124 len = strlen(ap) + maxlen + 4; 125 } 126 cp = malloc(len); 127 if (cp == NULL) |
| 128 return (NULL); | 128 errx(1, "malloc failed"); |
| 129 if (ap == NULL) 130 sprintf(cp, " (%.*s)", (int)maxlen, cmd); 131 else if (strncmp(cmdpart(argv[0]), cmd, maxlen) != 0) 132 sprintf(cp, "%s (%.*s)", ap, (int)maxlen, cmd); 133 else 134 (void) strcpy(cp, ap); 135 return (cp); 136} | 129 if (ap == NULL) 130 sprintf(cp, " (%.*s)", (int)maxlen, cmd); 131 else if (strncmp(cmdpart(argv[0]), cmd, maxlen) != 0) 132 sprintf(cp, "%s (%.*s)", ap, (int)maxlen, cmd); 133 else 134 (void) strcpy(cp, ap); 135 return (cp); 136} |