| fmt.c (96053) | fmt.c (97845) |
|---|---|
| 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 96053 2002-05-05 04:42:50Z jmallett $"); | 36__FBSDID("$FreeBSD: head/bin/ps/fmt.c 97845 2002-06-05 01:32:21Z 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> --- 31 unchanged lines hidden (view full) --- 76 errx(1, "sysconf _SC_ARG_MAX failed"); 77 if (arg_max >= LONG_MAX / 4 || 4 * arg_max + 1 > SIZE_MAX) 78 errx(1, "sysconf _SC_ARG_MAX preposterously large"); 79 buf_size = 4 * arg_max + 1; 80 if ((buf = malloc(buf_size)) == NULL) 81 errx(1, "malloc failed"); 82 } 83 | 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> --- 31 unchanged lines hidden (view full) --- 76 errx(1, "sysconf _SC_ARG_MAX failed"); 77 if (arg_max >= LONG_MAX / 4 || 4 * arg_max + 1 > SIZE_MAX) 78 errx(1, "sysconf _SC_ARG_MAX preposterously large"); 79 buf_size = 4 * arg_max + 1; 80 if ((buf = malloc(buf_size)) == NULL) 81 errx(1, "malloc failed"); 82 } 83 |
| 84 if (*argv == 0) { 85 buf[0] = 0; | 84 if (*argv == NULL) { 85 buf[0] = '\0'; |
| 86 return (buf); 87 } 88 dst = buf; | 86 return (buf); 87 } 88 dst = buf; |
| 89 for (p = argv; (src = *p++) != 0; ) { 90 if (*src == 0) | 89 for (p = argv; (src = *p++) != NULL; ) { 90 if (*src == '\0') |
| 91 continue; 92 len = (buf_size - 1 - (dst - buf)) / 4; 93 strvisx(dst, src, strlen(src) < len ? strlen(src) : len, 94 VIS_NL | VIS_CSTYLE); | 91 continue; 92 len = (buf_size - 1 - (dst - buf)) / 4; 93 strvisx(dst, src, strlen(src) < len ? strlen(src) : len, 94 VIS_NL | VIS_CSTYLE); |
| 95 while (*dst) | 95 while (*dst != '\0') |
| 96 dst++; 97 if ((buf_size - 1 - (dst - buf)) / 4 > 0) 98 *dst++ = ' '; 99 } 100 /* Chop off trailing space */ 101 if (dst != buf && dst[-1] == ' ') 102 dst--; 103 *dst = '\0'; --- 37 unchanged lines hidden --- | 96 dst++; 97 if ((buf_size - 1 - (dst - buf)) / 4 > 0) 98 *dst++ = ' '; 99 } 100 /* Chop off trailing space */ 101 if (dst != buf && dst[-1] == ' ') 102 dst--; 103 *dst = '\0'; --- 37 unchanged lines hidden --- |