summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorotto <>2016-07-06 20:32:02 +0000
committerotto <>2016-07-06 20:32:02 +0000
commit8b5fded92021338833c442009338a864188f9363 (patch)
tree859baedd7ee18de631419a21da9c643b5bba2343 /src/lib
parentc9e35f43e12c7641ab7767b141f1948129ae72c9 (diff)
downloadopenbsd-8b5fded92021338833c442009338a864188f9363.tar.gz
openbsd-8b5fded92021338833c442009338a864188f9363.tar.bz2
openbsd-8b5fded92021338833c442009338a864188f9363.zip
J/j is a three valued option, document and fix code to actuall support that
with a little help from jmc@ for the man page bits ok jca@ and a reluctant tedu@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libc/stdlib/malloc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 678c782d20..b4c0010f35 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc.c,v 1.191 2016/06/30 09:00:48 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.192 2016/07/06 20:32:02 otto Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -533,10 +533,12 @@ omalloc_parseopt(char opt)
533 mopts.malloc_hint = 1; 533 mopts.malloc_hint = 1;
534 break; 534 break;
535 case 'j': 535 case 'j':
536 mopts.malloc_junk = 0; 536 if (mopts.malloc_junk > 0)
537 mopts.malloc_junk--;
537 break; 538 break;
538 case 'J': 539 case 'J':
539 mopts.malloc_junk = 2; 540 if (mopts.malloc_junk < 2)
541 mopts.malloc_junk++;
540 break; 542 break;
541 case 'n': 543 case 'n':
542 case 'N': 544 case 'N':