diff options
| author | Leah Neukirchen <leah@vuxu.org> | 2017-11-03 22:52:03 +0100 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2017-11-03 22:52:03 +0100 |
| commit | 2d193c8d4292c4ab0e3aaa5f4e02061df069bbb5 (patch) | |
| tree | 82a0085cafb8d3dadc22f419ed7b5b7577859d74 | |
| parent | d363e5a46754d08bdbe06ab6ac6ddf1ce526bbb9 (diff) | |
| download | xe-2d193c8d4292c4ab0e3aaa5f4e02061df069bbb5.tar.gz xe-2d193c8d4292c4ab0e3aaa5f4e02061df069bbb5.tar.xz xe-2d193c8d4292c4ab0e3aaa5f4e02061df069bbb5.zip | |
parse_jobs: always support -jNx
Else even -j1x breaks on systems with no _SC_NPROCESSORS_ONLN.
| -rw-r--r-- | xe.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xe.c b/xe.c index 4a62df3..c929cb8 100644 --- a/xe.c +++ b/xe.c @@ -331,9 +331,12 @@ parse_jobs(char *s) char *e; int n; -#ifdef _SC_NPROCESSORS_ONLN if (*s && s[strlen(s) - 1] == 'x') { +#ifdef _SC_NPROCESSORS_ONLN n = (int)sysconf(_SC_NPROCESSORS_ONLN); +#else + n = 1; +#endif double d = 0.0; errno = 0; d = strtod(s, &e); @@ -344,9 +347,7 @@ parse_jobs(char *s) n = (int)(d * n); if (n < 1) n = 1; - } else -#endif - if (strcmp(s, "j") == 0) { + } else if (strcmp(s, "j") == 0) { n = -1; } else { errno = 0; |