emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

sysctl: fix coding style

Browse Source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-01-25 09:18:38 +01:00
parent 1cde286c75
commit 8fe81caa42
1 changed files with 565 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
sysctl.c
View File

@ -1,16 +1,13 @@
/* /*
* Sysctl 1.01 - A utility to read and manipulate the sysctl parameters * Sysctl 1.01 - A utility to read and manipulate the sysctl parameters
* *
*
* "Copyright 1999 George Staikos * "Copyright 1999 George Staikos
* This file may be used subject to the terms and conditions of the * This file may be used subject to the terms and conditions of the GNU
* GNU General Public License Version 2, or any later version * General Public License Version 2, or any later version at your option, as
* at your option, as published by the Free Software Foundation. * published by the Free Software Foundation. This program is distributed in
* This program is distributed in the hope that it will be useful, * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* but WITHOUT ANY WARRANTY; without even the implied warranty of * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * PURPOSE. See the GNU General Public License for more details."
* GNU General Public License for more details."
* *
* Changelog: * Changelog:
* v1.01: * v1.01:
@ -21,7 +18,6 @@
* Changes by Albert Cahalan, 2002. * Changes by Albert Cahalan, 2002.
*/ */
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
@ -41,7 +37,6 @@
#include "proc/procps.h" #include "proc/procps.h"
#include "proc/version.h" #include "proc/version.h"
/* Proof that C++ causes brain damage: */ /* Proof that C++ causes brain damage: */
typedef int bool; typedef int bool;
static bool true = 1; static bool true = 1;
@ -50,7 +45,6 @@ static bool false = 0;
/* /*
* Globals... * Globals...
*/ */
static const char PROC_PATH[] = "/proc/sys/"; static const char PROC_PATH[] = "/proc/sys/";
static const char DEFAULT_PRELOAD[] = "/etc/sysctl.conf"; static const char DEFAULT_PRELOAD[] = "/etc/sysctl.conf";
static bool NameOnly; static bool NameOnly;
@ -60,37 +54,44 @@ static bool IgnoreError;
static bool Quiet; static bool Quiet;
static char *pattern; static char *pattern;
/* Function prototypes. */
static int pattern_match(const char *string, const char *pattern); static int pattern_match(const char *string, const char *pattern);
static int DisplayAll(const char *restrict const path);
static void slashdot(char *restrict p, char old, char new){ static void slashdot(char *restrict p, char old, char new)
{
int warned = 1; int warned = 1;
p = strpbrk(p, "/."); p = strpbrk(p, "/.");
if(!p) return; /* nothing -- can't be, but oh well */ if (!p)
if(*p==new) return; /* already in desired format */ /* nothing -- can't be, but oh well */
return;
if (*p == new)
/* already in desired format */
return;
while (p) { while (p) {
char c = *p; char c = *p;
if ((*(p + 1) == '/' || *(p + 1) == '.') && warned) { if ((*(p + 1) == '/' || *(p + 1) == '.') && warned) {
xwarnx(_("separators should not be repeated: %s"), p); xwarnx(_("separators should not be repeated: %s"), p);
warned = 0; warned = 0;
} }
if(c==old) *p=new; if (c == old)
if(c==new) *p=old; *p = new;
if (c == new)
*p = old;
p = strpbrk(p + 1, "/."); p = strpbrk(p + 1, "/.");
} }
} }
/* /*
* Display the usage format * Display the usage format
*
*/ */
static void __attribute__ ((__noreturn__)) static void __attribute__ ((__noreturn__))
Usage(FILE * out) Usage(FILE * out)
{ {
fputs(USAGE_HEADER, out); fputs(USAGE_HEADER, out);
fprintf(out, fprintf(out,
_(" %s [options] [variable[=value] ...]\n"), program_invocation_short_name); _(" %s [options] [variable[=value] ...]\n"),
program_invocation_short_name);
fputs(USAGE_OPTIONS, out); fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all display all variables\n" fputs(_(" -a, --all display all variables\n"
" -A alias of -a\n" " -A alias of -a\n"
@ -119,9 +120,9 @@ static void __attribute__ ((__noreturn__))
/* /*
* Strip the leading and trailing spaces from a string * Strip the leading and trailing spaces from a string
*
*/ */
static char *StripLeadingAndTrailingSpaces(char *oneline) { static char *StripLeadingAndTrailingSpaces(char *oneline)
{
char *t; char *t;
if (!oneline || !*oneline) if (!oneline || !*oneline)
@ -141,13 +142,11 @@ static char *StripLeadingAndTrailingSpaces(char *oneline) {
return t; return t;
} }
static int DisplayAll(const char *restrict const path);
/* /*
* Read a sysctl setting * Read a sysctl setting
*
*/ */
static int ReadSetting(const char *restrict const name) { static int ReadSetting(const char *restrict const name)
{
int rc = 0; int rc = 0;
char *restrict tmpname; char *restrict tmpname;
char *restrict outname; char *restrict outname;
@ -162,17 +161,20 @@ static int ReadSetting(const char *restrict const name) {
/* used to display the output */ /* used to display the output */
outname = xstrdup(name); outname = xstrdup(name);
slashdot(outname,'/','.'); /* change / to . */ /* change / to . */
slashdot(outname, '/', '.');
/* used to open the file */ /* used to open the file */
tmpname = xmalloc(strlen(name) + strlen(PROC_PATH) + 2); tmpname = xmalloc(strlen(name) + strlen(PROC_PATH) + 2);
strcpy(tmpname, PROC_PATH); strcpy(tmpname, PROC_PATH);
strcat(tmpname, name); strcat(tmpname, name);
slashdot(tmpname+strlen(PROC_PATH),'.','/'); /* change . to / */ /* change . to / */
slashdot(tmpname + strlen(PROC_PATH), '.', '/');
/* used to display the output */ /* used to display the output */
outname = xstrdup(name); outname = xstrdup(name);
slashdot(outname,'/','.'); /* change / to . */ /* change / to . */
slashdot(outname, '/', '.');
if (stat(tmpname, &ts) < 0) { if (stat(tmpname, &ts) < 0) {
if (!IgnoreError) { if (!IgnoreError) {
@ -220,19 +222,23 @@ static int ReadSetting(const char *restrict const name) {
} else { } else {
errno = 0; errno = 0;
if (fgets(inbuf, sizeof inbuf - 1, fp)) { if (fgets(inbuf, sizeof inbuf - 1, fp)) {
// this loop is required, see /* this loop is required, see
// /sbin/sysctl -a | egrep -6 dev.cdrom.info * /sbin/sysctl -a | egrep -6 dev.cdrom.info
*/
do { do {
if (NameOnly) { if (NameOnly) {
fprintf(stdout, "%s\n", outname); fprintf(stdout, "%s\n", outname);
} else { } else {
/* already has the \n in it */ /* already has the \n in it */
if (PrintName) { if (PrintName) {
fprintf(stdout, "%s = %s", outname, inbuf); fprintf(stdout, "%s = %s",
outname, inbuf);
} else { } else {
if (!PrintNewline) { if (!PrintNewline) {
char *nlptr = strchr(inbuf,'\n'); char *nlptr =
if(nlptr) *nlptr='\0'; strchr(inbuf, '\n');
if (nlptr)
*nlptr = '\0';
} }
fprintf(stdout, "%s", inbuf); fprintf(stdout, "%s", inbuf);
} }
@ -241,7 +247,8 @@ static int ReadSetting(const char *restrict const name) {
} else { } else {
switch (errno) { switch (errno) {
case EACCES: case EACCES:
xwarnx(_("permission denied on key '%s'"), outname); xwarnx(_("permission denied on key '%s'"),
outname);
rc = -1; rc = -1;
break; break;
case EISDIR: { case EISDIR: {
@ -268,13 +275,11 @@ out:
return rc; return rc;
} }
/* /*
* Display all the sysctl settings * Display all the sysctl settings
*
*/ */
static int DisplayAll(const char *restrict const path) { static int DisplayAll(const char *restrict const path)
{
int rc = 0; int rc = 0;
int rc2; int rc2;
DIR *restrict dp; DIR *restrict dp;
@ -287,11 +292,14 @@ static int DisplayAll(const char *restrict const path) {
xwarnx(_("unable to open directory \"%s\""), path); xwarnx(_("unable to open directory \"%s\""), path);
rc = -1; rc = -1;
} else { } else {
readdir(dp); // skip . readdir(dp); /* skip . */
readdir(dp); // skip .. readdir(dp); /* skip .. */
while ((de = readdir(dp))) { while ((de = readdir(dp))) {
char *restrict tmpdir; char *restrict tmpdir;
tmpdir = (char *restrict)xmalloc(strlen(path)+strlen(de->d_name)+2); tmpdir =
(char *restrict) xmalloc(strlen(path) +
strlen(de->d_name) +
2);
sprintf(tmpdir, "%s%s", path, de->d_name); sprintf(tmpdir, "%s%s", path, de->d_name);
rc2 = stat(tmpdir, &ts); rc2 = stat(tmpdir, &ts);
if (rc2 != 0) { if (rc2 != 0) {
@ -301,7 +309,9 @@ static int DisplayAll(const char *restrict const path) {
strcat(tmpdir, "/"); strcat(tmpdir, "/");
DisplayAll(tmpdir); DisplayAll(tmpdir);
} else { } else {
rc |= ReadSetting(tmpdir+strlen(PROC_PATH)); rc |=
ReadSetting(tmpdir +
strlen(PROC_PATH));
} }
} }
free(tmpdir); free(tmpdir);
@ -311,12 +321,11 @@ static int DisplayAll(const char *restrict const path) {
return rc; return rc;
} }
/* /*
* Write a sysctl setting * Write a sysctl setting
*
*/ */
static int WriteSetting(const char *setting) { static int WriteSetting(const char *setting)
{
int rc = 0; int rc = 0;
const char *name = setting; const char *name = setting;
const char *value; const char *value;
@ -326,18 +335,20 @@ static int WriteSetting(const char *setting) {
FILE *fp; FILE *fp;
struct stat ts; struct stat ts;
if (!name) { /* probably don't want to display this err */ if (!name)
/* probably don't want to display this err */
return 0; return 0;
} /* end if */
equals = strchr(setting, '='); equals = strchr(setting, '=');
if (!equals) { if (!equals) {
xwarnx(_("\"%s\" must be of the form name=value"), setting); xwarnx(_("\"%s\" must be of the form name=value"),
setting);
return -1; return -1;
} }
value = equals + 1; /* point to the value in name=value */ /* point to the value in name=value */
value = equals + 1;
if (!*name || !*value || name == equals) { if (!*name || !*value || name == equals) {
xwarnx(_("malformed setting \"%s\""), setting); xwarnx(_("malformed setting \"%s\""), setting);
@ -349,13 +360,15 @@ static int WriteSetting(const char *setting) {
strcpy(tmpname, PROC_PATH); strcpy(tmpname, PROC_PATH);
strncat(tmpname, name, (int) (equals - name)); strncat(tmpname, name, (int) (equals - name));
tmpname[equals - name + strlen(PROC_PATH)] = 0; tmpname[equals - name + strlen(PROC_PATH)] = 0;
slashdot(tmpname+strlen(PROC_PATH),'.','/'); /* change . to / */ /* change . to / */
slashdot(tmpname + strlen(PROC_PATH), '.', '/');
/* used to display the output */ /* used to display the output */
outname = xmalloc(equals - name + 1); outname = xmalloc(equals - name + 1);
strncpy(outname, name, (int) (equals - name)); strncpy(outname, name, (int) (equals - name));
outname[equals - name] = 0; outname[equals - name] = 0;
slashdot(outname,'/','.'); /* change / to . */ /* change / to . */
slashdot(outname, '/', '.');
if (stat(tmpname, &ts) < 0) { if (stat(tmpname, &ts) < 0) {
if (!IgnoreError) { if (!IgnoreError) {
@ -409,7 +422,8 @@ static int WriteSetting(const char *setting) {
fprintf(stdout, "%s\n", outname); fprintf(stdout, "%s\n", outname);
} else { } else {
if (PrintName) { if (PrintName) {
fprintf(stdout, "%s = %s\n", outname, value); fprintf(stdout, "%s = %s\n",
outname, value);
} else { } else {
if (PrintNewline) if (PrintNewline)
fprintf(stdout, "%s\n", value); fprintf(stdout, "%s\n", value);
@ -430,23 +444,21 @@ static int pattern_match(const char *string, const char *pattern)
int status; int status;
regex_t re; regex_t re;
if (regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0) { if (regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0)
return (0); /* Report error. */ return (0);
}
status = regexec(&re, string, (size_t) 0, NULL, 0); status = regexec(&re, string, (size_t) 0, NULL, 0);
regfree(&re); regfree(&re);
if (status != 0) { if (status != 0)
return (0); /* Report error. */ return (0);
}
return (1); return (1);
} }
/* /*
* Preload the sysctl's from the conf file * Preload the sysctl's from the conf file. We parse the file and then
* - we parse the file and then reform it (strip out whitespace) * reform it (strip out whitespace).
*
*/ */
static int Preload(const char *restrict const filename) { static int Preload(const char *restrict const filename)
{
char oneline[256]; char oneline[256];
char buffer[256]; char buffer[256];
FILE *fp; FILE *fp;
@ -456,9 +468,7 @@ static int Preload(const char *restrict const filename) {
char *name, *value; char *name, *value;
fp = (filename[0] == '-' && !filename[1]) fp = (filename[0] == '-' && !filename[1])
? stdin ? stdin : fopen(filename, "r");
: fopen(filename, "r")
;
if (!fp) { if (!fp) {
xwarn(_("cannot open \"%s\""), filename); xwarn(_("cannot open \"%s\""), filename);
@ -477,26 +487,27 @@ static int Preload(const char *restrict const filename) {
name = strtok(t, "="); name = strtok(t, "=");
if (!name || !*name) { if (!name || !*name) {
xwarnx(_("%s(%d): invalid syntax, continuing..."), filename, n); xwarnx(_("%s(%d): invalid syntax, continuing..."),
filename, n);
continue; continue;
} }
StripLeadingAndTrailingSpaces(name); StripLeadingAndTrailingSpaces(name);
if (pattern && !pattern_match(name, pattern)){ if (pattern && !pattern_match(name, pattern))
continue; continue;
}
value = strtok(NULL, "\n\r"); value = strtok(NULL, "\n\r");
if (!value || !*value) { if (!value || !*value) {
xwarnx(_("%s(%d): invalid syntax, continuing..."), filename, n); xwarnx(_("%s(%d): invalid syntax, continuing..."),
filename, n);
continue; continue;
} }
while ((*value == ' ' || *value == '\t') && *value != 0) while ((*value == ' ' || *value == '\t') && *value != 0)
value++; value++;
// should NameOnly affect this? /* should NameOnly affect this? */
sprintf(buffer, "%s=%s", name, value); sprintf(buffer, "%s=%s", name, value);
rc |= WriteSetting(buffer); rc |= WriteSetting(buffer);
} }
@ -517,7 +528,8 @@ static int sortpairs(const void* A, const void* B)
return strcmp(a->name, b->name); return strcmp(a->name, b->name);
} }
static int PreloadSystem(void) { static int PreloadSystem(void)
{
unsigned di, i; unsigned di, i;
const char *dirs[] = { const char *dirs[] = {
"/run/sysctl.d", "/run/sysctl.d",
@ -535,27 +547,33 @@ static int PreloadSystem(void) {
DIR *dp = opendir(dirs[di]); DIR *dp = opendir(dirs[di]);
if (!dp) if (!dp)
continue; continue;
while ((de = readdir(dp))) { while ((de = readdir(dp))) {
if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) { if (!strcmp(de->d_name, ".")
|| !strcmp(de->d_name, ".."))
continue; continue;
} if (strlen(de->d_name) < 6
if (strlen(de->d_name) < 6 || !strcmp(de->d_name+strlen(de->d_name)-6, ".conf")) || !strcmp(de->d_name + strlen(de->d_name) - 6, ".conf"))
continue; continue;
/* check if config already known */ /* check if config already known */
for (i = 0; i < ncfgs; ++i) { for (i = 0; i < ncfgs; ++i) {
if (!strcmp(cfgs[i]->name, de->d_name)) if (!strcmp(cfgs[i]->name, de->d_name))
break; break;
} }
if (i < ncfgs) // already in if (i < ncfgs)
/* already in */
continue; continue;
if (ncfgs % nprealloc == 0) { if (ncfgs % nprealloc == 0)
cfgs = xrealloc(cfgs, sizeof(struct pair *) * (ncfgs + nprealloc)); cfgs = xrealloc(cfgs, sizeof(struct pair *) * (ncfgs + nprealloc));
} cfgs[ncfgs] =
cfgs[ncfgs] = xmalloc(sizeof(struct pair) + strlen(de->d_name)*2+2 + strlen(dirs[di])+1); xmalloc(sizeof(struct pair) + strlen(de->d_name) * 2 + 2 +
strlen(dirs[di]) + 1);
cfgs[ncfgs]->name = (char *) cfgs[ncfgs] + sizeof(struct pair); cfgs[ncfgs]->name = (char *) cfgs[ncfgs] + sizeof(struct pair);
strcpy(cfgs[ncfgs]->name, de->d_name); strcpy(cfgs[ncfgs]->name, de->d_name);
cfgs[ncfgs]->value = (char*)cfgs[ncfgs]+sizeof(struct pair) + strlen(cfgs[ncfgs]->name)+1; cfgs[ncfgs]->value =
(char *) cfgs[ncfgs] + sizeof(struct pair) + strlen(cfgs[ncfgs]->name) +
1;
sprintf(cfgs[ncfgs]->value, "%s/%s", dirs[di], de->d_name); sprintf(cfgs[ncfgs]->value, "%s/%s", dirs[di], de->d_name);
ncfgs++; ncfgs++;
@ -576,10 +594,8 @@ static int PreloadSystem(void) {
return Preload(DEFAULT_PRELOAD); return Preload(DEFAULT_PRELOAD);
} }
/* /*
* Main... * Main...
*
*/ */
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -620,9 +636,8 @@ int main(int argc, char *argv[])
IgnoreError = false; IgnoreError = false;
Quiet = false; Quiet = false;
if (argc < 2) { if (argc < 2)
Usage(stderr); Usage(stderr);
}
while ((c = while ((c =
getopt_long(argc, argv, "bneNwfp::qoxaAXr:Vdh", longopts, getopt_long(argc, argv, "bneNwfp::qoxaAXr:Vdh", longopts,
@ -637,8 +652,9 @@ int main(int argc, char *argv[])
break; break;
case 'e': case 'e':
/* /*
* For FreeBSD, -e means a "%s=%s\n" format. ("%s: %s\n" default) * For FreeBSD, -e means a "%s=%s\n" format.
* We (and NetBSD) use "%s = %s\n" always, and -e to ignore errors. * ("%s: %s\n" default). We (and NetBSD) use
* "%s = %s\n" always, and -e to ignore errors.
*/ */
IgnoreError = true; IgnoreError = true;
break; break;
@ -675,7 +691,7 @@ int main(int argc, char *argv[])
break; break;
case 'V': case 'V':
printf(PROCPS_NG_VERSION); printf(PROCPS_NG_VERSION);
exit(0); return EXIT_SUCCESS;
case 'd': /* BSD: print description ("vm.kvm_size: Size of KVM") */ case 'd': /* BSD: print description ("vm.kvm_size: Size of KVM") */
case 'h': /* BSD: human-readable (did FreeBSD 5 make -e default?) */ case 'h': /* BSD: human-readable (did FreeBSD 5 make -e default?) */
case '?': case '?':
@ -707,5 +723,3 @@ int main(int argc, char *argv[])
return ReturnCode; return ReturnCode;
} }