File 0001-Preload-sysctl-lines-even-if-longer-than-s... of Package procps

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Preload-sysctl-lines-even-if-longer-than-stdio-buffe.patch of Package procps (Revision 1e496dcec397b900bb39770abf8f4d84)

Currently displaying revision 1e496dcec397b900bb39770abf8f4d84 , Show latest

From 702a464040bef969db7483d3cc122dfeec653d6f Mon Sep 17 00:00:00 2001
From: Werner Fink <werner@suse.de>
Date: Thu, 18 Jan 2018 11:06:55 +0100
Subject: [PATCH 1/3] Preload sysctl lines even if longer than stdio buffer

by using getline(3) to use a dynamically increased buffer
if required by the input found in sysctl configuration files.

Signed-off-by: Werner Fink <werner@suse.de>
---
 sysctl.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git sysctl.c sysctl.c
index 7c05243..42162f5 100644
--- sysctl.c
+++ sysctl.c
@@ -511,18 +511,21 @@ static int pattern_match(const char *string, const char *pat)
  */
 static int Preload(const char *restrict const filename)
 {
-	char oneline[LINELEN];
-	char buffer[LINELEN];
+	char *oneline;
 	FILE *fp;
 	char *t;
 	int n = 0;
 	int rc = 0;
+	size_t blen = LINELEN;
+	ssize_t rlen;
 	char *name, *value;
 	glob_t globbuf;
 	int globerr;
 	int globflg;
 	int j;
 
+	oneline = xmalloc(blen);
+
 	globflg = GLOB_NOCHECK;
 #ifdef GLOB_BRACE
 	globflg |= GLOB_BRACE;
@@ -544,13 +547,19 @@ static int Preload(const char *restrict const filename)
 		    ? stdin : fopen(globbuf.gl_pathv[j], "r");
 		if (!fp) {
 			xwarn(_("cannot open \"%s\""), globbuf.gl_pathv[j]);
-			return -1;
+			rc = -1;
+			goto out;
 		}
 
-		while (fgets(oneline, sizeof oneline, fp)) {
+		while ((rlen =  getline(&oneline, &blen, fp)) != -1) {
+			size_t offset;
+
 			n++;
-			t = StripLeadingAndTrailingSpaces(oneline);
 
+			if (rlen < 2)
+				continue;
+
+			t = StripLeadingAndTrailingSpaces(oneline);
 			if (strlen(t) < 2)
 				continue;
 
@@ -569,6 +578,10 @@ static int Preload(const char *restrict const filename)
 			if (pattern && !pattern_match(name, pattern))
 				continue;
 
+			offset = strlen(name);
+			memmove(&oneline[0], name, offset);
+			oneline[offset++] = '=';
+
 			value = strtok(NULL, "\n\r");
 			if (!value || !*value) {
 				xwarnx(_("%s(%d): invalid syntax, continuing..."),
@@ -580,12 +593,16 @@ static int Preload(const char *restrict const filename)
 				value++;
 
 			/* should NameOnly affect this? */
-			sprintf(buffer, "%s=%s", name, value);
-			rc |= WriteSetting(buffer);
+			memmove(&oneline[offset], value, strlen(value));
+			offset += strlen(value);
+			oneline[offset] = '\0';
+
+			rc |= WriteSetting(oneline);
 		}
 
 		fclose(fp);
 	}
+out:
 	return rc;
 }
 
-- 
2.16.1

Places

File 0001-Preload-sysctl-lines-even-if-longer-than-stdio-buffe.patch of Package procps (Revision 1e496dcec397b900bb39770abf8f4d84)

Places