From: otto <otto@openbsd.org>
Date: Thu, 30 Jun 2016 09:00:48 +0000 (+0000)
Subject: adapt S option: add C, rm F (not relevant with 0 cache and disables
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=83ac41f60fc73c7cc2af6342c481edea45ada681;p=openbsd

adapt S option: add C, rm F (not relevant with 0 cache and disables
chunk rnd), rm P: is default
---

diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index a0b2a7df57a..678c782d200 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.190 2016/06/28 06:40:11 tb Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.191 2016/06/30 09:00:48 otto Exp $	*/
 /*
  * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
  * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -617,12 +617,12 @@ omalloc_init(struct dir_info **dp)
 		for (; p != NULL && *p != '\0'; p++) {
 			switch (*p) {
 			case 'S':
-				for (q = "FGJP"; *q != '\0'; q++)
+				for (q = "CGJ"; *q != '\0'; q++)
 					omalloc_parseopt(*q);
 				mopts.malloc_cache = 0;
 				break;
 			case 's':
-				for (q = "fgj"; *q != '\0'; q++)
+				for (q = "cgj"; *q != '\0'; q++)
 					omalloc_parseopt(*q);
 				mopts.malloc_cache = MALLOC_DEFAULT_CACHE;
 				break;