From owner-p4-projects@FreeBSD.ORG Wed Jul 29 18:55:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CCAB1065672; Wed, 29 Jul 2009 18:55:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 231BD106564A for ; Wed, 29 Jul 2009 18:55:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAE818FC15 for ; Wed, 29 Jul 2009 18:55:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6TItN1A011183 for ; Wed, 29 Jul 2009 18:55:23 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6TItNn4011181 for perforce@freebsd.org; Wed, 29 Jul 2009 18:55:23 GMT (envelope-from trasz@freebsd.org) Date: Wed, 29 Jul 2009 18:55:23 GMT Message-Id: <200907291855.n6TItNn4011181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 166742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2009 18:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=166742 Change 166742 by trasz@trasz_victim on 2009/07/29 18:54:48 Signal overflow by ERANGE, not EFBIG. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#33 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#18 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#33 (text+ko) ==== @@ -1157,7 +1157,7 @@ sbuf_finish(outputsbuf); if (outbuflen < sbuf_len(outputsbuf) + 1) { sbuf_delete(outputsbuf); - return (EFBIG); /* ERANGE? */ + return (ERANGE); } error = copyout(sbuf_data(outputsbuf), outbufp, sbuf_len(outputsbuf) + 1); sbuf_delete(outputsbuf); ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#18 (text+ko) ==== @@ -40,42 +40,6 @@ #define BUFLEN_DEFAULT 1024 -#if 0 -static void -print_subject(int subject, id_t id) -{ - - switch (subject) { - case HRL_SUBJECT_PROCESS: - printf("process:%u", (unsigned int)id); - break; - case HRL_SUBJECT_USER: - pwd = getpwuid(id); - if (pwd != NULL) - printf("user:%s", pwd->pw_name); - else - printf("user:%u", (unsigned int)id); - break; - case HRL_SUBJECT_GROUP: - grp = getgrgid(id); - if (grp != NULL) - printf("group:%s", grp->gr_name); - else - printf("group:%u", (unsigned int)id); - break; - case HRL_SUBJECT_LOGINCLASS: - printf("class:%u", (unsigned int)id); - break; - case HRL_SUBJECT_JAIL: - printf("jail:%u", (unsigned int)id); - break; - default: - printf("undefined<0x%x>:%u", subject, (unsigned int)id); - break; - } -} -#endif - static id_t parse_user(const char *s) { @@ -226,9 +190,9 @@ err(1, "realloc"); error = hrl_get_limits(filter, strlen(filter) + 1, outbuf, outbuflen); - if (error && errno != EFBIG) + if (error && errno != ERANGE) err(1, "hrl_get_limits"); - } while (error && errno == EFBIG); + } while (error && errno == ERANGE); printf("Resource utilisation:\n"); print_rules(outbuf); @@ -264,9 +228,9 @@ err(1, "realloc"); error = hrl_get_usage(filter, strlen(filter) + 1, outbuf, outbuflen); - if (error && errno != EFBIG) + if (error && errno != ERANGE) err(1, "hrl_get_usage"); - } while (error && errno == EFBIG); + } while (error && errno == ERANGE); for (tmp = outbuf; *tmp != '\0'; tmp++) if (*tmp == ',') @@ -299,9 +263,9 @@ err(1, "realloc"); error = hrl_get_rules(filter, filterlen, outbuf, outbuflen); - if (error && errno != EFBIG) + if (error && errno != ERANGE) err(1, "hrl_get_rules"); - } while (error && errno == EFBIG); + } while (error && errno == ERANGE); printf("Defined resource limits:\n"); print_rules(outbuf);