po: update es.po (from translationproject.org)

[thirdparty/util-linux.git] / lib / cpuset.c

diff --git a/lib/cpuset.c b/lib/cpuset.c
index cf22aa7786a6425e7ca156c6e69bb49e802ebf37..011b6882b82b785a8382ed2146d2cc8a5559b465 100644 (file)
--- a/lib/cpuset.c
+++ b/lib/cpuset.c
@@ -7,6 +7,9 @@
  *
  * Based on code from taskset.c and Linux kernel.
  *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ *
  * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
  */
 
@@ -26,23 +29,21 @@ static inline int val_to_char(int v)
 {
        if (v >= 0 && v < 10)
                return '0' + v;
-       else if (v >= 10 && v < 16)
+       if (v >= 10 && v < 16)
                return ('a' - 10) + v;
-       else
-               return -1;
+       return -1;
 }
 
 static inline int char_to_val(int c)
 {
        int cl;
 
-       cl = tolower(c);
        if (c >= '0' && c <= '9')
                return c - '0';
-       else if (cl >= 'a' && cl <= 'f')
+       cl = tolower(c);
+       if (cl >= 'a' && cl <= 'f')
                return cl + (10 - 'a');
-       else
-               return -1;
+       return -1;
 }
 
 static const char *nexttoken(const char *q,  int sep)
@@ -59,6 +60,7 @@ static const char *nexttoken(const char *q,  int sep)
  */
 int get_max_number_of_cpus(void)
 {
+#ifdef SYS_sched_getaffinity
        int n, cpus = 2048;
        size_t setsize;
        cpu_set_t *set = cpuset_alloc(cpus, &setsize, NULL);
@@ -83,6 +85,7 @@ int get_max_number_of_cpus(void)
                cpuset_free(set);
                return n * 8;
        }
+#endif
        return -1;
 }
 
@@ -164,21 +167,18 @@ char *cpulist_create(char *str, size_t len,
                                        break;
                        }
                        if (!run)
-                               rlen = snprintf(ptr, len, "%zd,", i);
+                               rlen = snprintf(ptr, len, "%zu,", i);
                        else if (run == 1) {
-                               rlen = snprintf(ptr, len, "%zd,%zd,", i, i + 1);
+                               rlen = snprintf(ptr, len, "%zu,%zu,", i, i + 1);
                                i++;
                        } else {
-                               rlen = snprintf(ptr, len, "%zd-%zd,", i, i + run);
+                               rlen = snprintf(ptr, len, "%zu-%zu,", i, i + run);
                                i += run;
                        }
-                       if (rlen < 0 || (size_t) rlen + 1 > len)
+                       if (rlen < 0 || (size_t) rlen >= len)
                                return NULL;
                        ptr += rlen;
-                       if (rlen > 0 && len > (size_t) rlen)
-                               len -= rlen;
-                       else
-                               len = 0;
+                       len -= rlen;
                }
        }
        ptr -= entry_made;
@@ -253,7 +253,6 @@ int cpumask_parse(const char *str, cpu_set_t *set, size_t setsize)
                        CPU_SET_S(cpu + 2, setsize, set);
                if (val & 8)
                        CPU_SET_S(cpu + 3, setsize, set);
-               len--;
                ptr--;
                cpu += 4;
        }
@@ -263,13 +262,19 @@ int cpumask_parse(const char *str, cpu_set_t *set, size_t setsize)
 
 /*
  * Parses string with list of CPU ranges.
+ * Returns 0 on success.
+ * Returns 1 on error.
+ * Returns 2 if fail is set and a cpu number passed in the list doesn't fit
+ * into the cpu_set. If fail is not set cpu numbers that do not fit are
+ * ignored and 0 is returned instead.
  */
 int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize, int fail)
 {
        size_t max = cpuset_nbits(setsize);
        const char *p, *q;
-       q = str;
+       int r = 0;
 
+       q = str;
        CPU_ZERO_S(setsize, set);
 
        while (p = q, q = nexttoken(q, ','), p) {
@@ -277,8 +282,9 @@ int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize, int fail)
                unsigned int b; /* end of range */
                unsigned int s; /* stride */
                const char *c1, *c2;
+               char c;
 
-               if (sscanf(p, "%u", &a) < 1)
+               if ((r = sscanf(p, "%u%c", &a, &c)) < 1)
                        return 1;
                b = a;
                s = 1;
@@ -286,11 +292,13 @@ int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize, int fail)
                c1 = nexttoken(p, '-');
                c2 = nexttoken(p, ',');
                if (c1 != NULL && (c2 == NULL || c1 < c2)) {
-                       if (sscanf(c1, "%u", &b) < 1)
+                       if ((r = sscanf(c1, "%u%c", &b, &c)) < 1)
                                return 1;
                        c1 = nexttoken(c1, ':');
                        if (c1 != NULL && (c2 == NULL || c1 < c2)) {
-                               if (sscanf(c1, "%u", &s) < 1)
+                               if ((r = sscanf(c1, "%u%c", &s, &c)) < 1)
+                                       return 1;
+                               if (s == 0)
                                        return 1;
                        }
                }
@@ -299,16 +307,18 @@ int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize, int fail)
                        return 1;
                while (a <= b) {
                        if (fail && (a >= max))
-                               return 1;
+                               return 2;
                        CPU_SET_S(a, setsize, set);
                        a += s;
                }
        }
 
+       if (r == 2)
+               return 1;
        return 0;
 }
 
-#ifdef TEST_PROGRAM
+#ifdef TEST_PROGRAM_CPUSET
 
 #include <getopt.h>
 
@@ -320,10 +330,10 @@ int main(int argc, char *argv[])
        int ncpus = 2048, rc, c;
 
        static const struct option longopts[] = {
-           { "ncpus", 1, 0, 'n' },
-           { "mask",  1, 0, 'm' },
-           { "range", 1, 0, 'r' },
-           { NULL,    0, 0, 0 }
+           { "ncpus", 1, NULL, 'n' },
+           { "mask",  1, NULL, 'm' },
+           { "range", 1, NULL, 'r' },
+           { NULL,    0, NULL, 0 }
        };
 
        while ((c = getopt_long(argc, argv, "n:m:r:", longopts, NULL)) != -1) {
@@ -372,6 +382,7 @@ int main(int argc, char *argv[])
        printf("[%s]\n", cpulist_create(buf, buflen, set, setsize));
 
        free(buf);
+       free(mask);
        free(range);
        cpuset_free(set);