diff options
| author | Craig Small <csmall@enc.com.au> | 2015-10-28 21:09:26 +1100 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2015-10-28 21:09:26 +1100 |
| commit | 471cf4cd36a127a0f73e72b7d435f07edc204f46 (patch) | |
| tree | 959d5b8c27e0cf3fa865925fd1d0eec65fb52a14 /sysctl.c | |
| parent | 2b0dd2d7022b31b417eddb211876a72080e3f5c0 (diff) | |
| parent | 94e4749be3ea218a57c22034dd45b80325c35586 (diff) | |
| download | procps-ng-471cf4cd36a127a0f73e72b7d435f07edc204f46.tar.gz | |
Merge branch 'master' into newlib
Conflicts:
pgrep.c
proc/sysinfo.c
ps/output.c
skill.c
top/top.c
top/top.h
w.c
Diffstat (limited to 'sysctl.c')
| -rw-r--r-- | sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -653,7 +653,7 @@ static int PreloadSystem(void) } - if (stat(DEFAULT_PRELOAD, &ts) < 0 || S_ISREG(ts.st_mode)) { + if (stat(DEFAULT_PRELOAD, &ts) == 0 && S_ISREG(ts.st_mode)) { if (!Quiet) printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD); rc |= Preload(DEFAULT_PRELOAD); |