| fmt.c (114583) | fmt.c (114600) |
|---|---|
| 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 --- 24 unchanged lines hidden (view full) --- 33 34#if 0 35#ifndef lint 36static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; 37#endif 38#endif 39 40#include <sys/cdefs.h> | 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 --- 24 unchanged lines hidden (view full) --- 33 34#if 0 35#ifndef lint 36static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; 37#endif 38#endif 39 40#include <sys/cdefs.h> |
| 41__FBSDID("$FreeBSD: head/bin/ps/fmt.c 114583 2003-05-03 16:39:34Z markm $"); | 41__FBSDID("$FreeBSD: head/bin/ps/fmt.c 114600 2003-05-03 20:52:48Z markm $"); |
| 42 43#include <sys/types.h> 44#include <sys/time.h> 45#include <sys/resource.h> 46 47#include <err.h> 48#include <limits.h> 49#include <stdio.h> --- 15 unchanged lines hidden (view full) --- 65 static size_t buf_size; 66 size_t len; 67 char **p, *dst, *src; 68 static char *buf = NULL; 69 70 if (buf == NULL) { 71 if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) 72 errx(1, "sysconf _SC_ARG_MAX failed"); | 42 43#include <sys/types.h> 44#include <sys/time.h> 45#include <sys/resource.h> 46 47#include <err.h> 48#include <limits.h> 49#include <stdio.h> --- 15 unchanged lines hidden (view full) --- 65 static size_t buf_size; 66 size_t len; 67 char **p, *dst, *src; 68 static char *buf = NULL; 69 70 if (buf == NULL) { 71 if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) 72 errx(1, "sysconf _SC_ARG_MAX failed"); |
| 73 if (arg_max >= LONG_MAX / 4 || 4 * arg_max + 1 > (long)SIZE_MAX) | 73 if (arg_max >= LONG_MAX / 4 || arg_max >= (long)(SIZE_MAX / 4)) |
| 74 errx(1, "sysconf _SC_ARG_MAX preposterously large"); 75 buf_size = 4 * arg_max + 1; 76 if ((buf = malloc(buf_size)) == NULL) 77 errx(1, "malloc failed"); 78 } 79 80 if (*argv == NULL) { 81 buf[0] = '\0'; --- 55 unchanged lines hidden --- | 74 errx(1, "sysconf _SC_ARG_MAX preposterously large"); 75 buf_size = 4 * arg_max + 1; 76 if ((buf = malloc(buf_size)) == NULL) 77 errx(1, "malloc failed"); 78 } 79 80 if (*argv == NULL) { 81 buf[0] = '\0'; --- 55 unchanged lines hidden --- |