Index: uspace/lib/posix/src/dlfcn.c =================================================================== --- uspace/lib/posix/src/dlfcn.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/dlfcn.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -42,5 +42,5 @@ fprintf(stderr, "dlopen() not implemented with non-zero flags (%s:%d), something will NOT work.\n", __FILE__, __LINE__); } - + return __helenos_libc_dlopen(filename, 0); } Index: uspace/lib/posix/src/fnmatch.c =================================================================== --- uspace/lib/posix/src/fnmatch.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/fnmatch.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -301,5 +301,5 @@ return COLL_ELM_INVALID; } - + *pattern = p + 1; return _coll_elm_char(*p); @@ -359,7 +359,7 @@ p++; } - + coll_elm_t current_elm = COLL_ELM_INVALID; - + while (*p != ']') { if (*p == '-' && *(p + 1) != ']' && @@ -374,5 +374,5 @@ continue; } - + if (*p == '[' && *(p + 1) == ':') { current_elm = COLL_ELM_INVALID; @@ -380,5 +380,5 @@ continue; } - + current_elm = _next_coll_elm(&p, flags); if (current_elm == COLL_ELM_INVALID) { @@ -460,5 +460,5 @@ return false; } - + /* None of the above, match anything else. */ p++; @@ -496,9 +496,9 @@ /* Entire sub-pattern matched. */ - + /* postconditions */ assert(*p == '\0' || *p == '*'); assert(*p != '\0' || *s == '\0' || (leading_dir && *s == '/')); - + *pattern = p; *string = s; @@ -667,8 +667,8 @@ match("helen??", "helenos", 0); match("****booo****", "booo", 0); - + match("hello[[:space:]]world", "hello world", 0); nomatch("hello[[:alpha:]]world", "hello world", 0); - + match("/hoooo*", "/hooooooo/hooo", 0); nomatch("/hoooo*", "/hooooooo/hooo", FNM_PATHNAME); @@ -680,5 +680,5 @@ nomatch("/hoooo", "/hooooooo/hooo", FNM_LEADING_DIR); match("/hooooooo", "/hooooooo/hooo", FNM_LEADING_DIR); - + match("*", "hell", 0); match("*?", "hell", 0); @@ -687,5 +687,5 @@ match("??*??", "hell", 0); nomatch("???*??", "hell", 0); - + nomatch("", "hell", 0); nomatch("?", "hell", 0); @@ -693,5 +693,5 @@ nomatch("???", "hell", 0); match("????", "hell", 0); - + match("*", "h.ello", FNM_PERIOD); match("*", "h.ello", FNM_PATHNAME | FNM_PERIOD); Index: uspace/lib/posix/src/pwd.c =================================================================== --- uspace/lib/posix/src/pwd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/pwd.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -120,10 +120,10 @@ assert(buffer != NULL); assert(result != NULL); - + if (strcmp(name, "user") != 0) { *result = NULL; return 0; } - + return getpwuid_r(0, pwd, buffer, bufsize, result); } @@ -161,8 +161,8 @@ assert(buffer != NULL); assert(result != NULL); - + static const char bf[] = { 'u', 's', 'e', 'r', '\0', '/', '\0', 'b', 'd', 's', 'h', '\0' }; - + if (uid != 0) { *result = NULL; Index: uspace/lib/posix/src/signal.c =================================================================== --- uspace/lib/posix/src/signal.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/signal.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -101,5 +101,5 @@ /* Commit suicide. */ task_kill(task_get_id()); - + /* Should not be reached. */ abort(); @@ -223,5 +223,5 @@ { assert(set != NULL); - + return (*set & (1 << signo)) != 0; } @@ -323,5 +323,5 @@ assert(signo >= 0 && signo <= _TOP_SIGNAL); assert(siginfo != NULL); - + signal_queue_item *item = malloc(sizeof(signal_queue_item)); link_initialize(&(item->link)); @@ -384,11 +384,11 @@ link_t *iterator = _signal_queue.head.next; link_t *next; - + while (iterator != &(_signal_queue).head) { next = iterator->next; - + signal_queue_item *item = list_get_instance(iterator, signal_queue_item, link); - + if (!sigismember(&_signal_mask, item->signo) && _signal_actions[item->signo].sa_handler != SIG_HOLD) { @@ -397,5 +397,5 @@ free(item); } - + iterator = next; } @@ -535,5 +535,5 @@ } } - + _dequeue_unblocked_signals(); Index: uspace/lib/posix/src/stdio.c =================================================================== --- uspace/lib/posix/src/stdio.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/stdio.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -277,5 +277,5 @@ size_t sz; char buf[4]; - + while (offset < size) { sz = 0; @@ -283,14 +283,14 @@ break; } - + const int fildes = *(int *) fd; size_t nwr; if (vfs_write(fildes, &posix_pos[fildes], buf, sz, &nwr) != EOK) break; - + chars++; offset += sizeof(wchar_t); } - + return chars; } @@ -311,5 +311,5 @@ .data = &fildes }; - + return printf_core(format, &spec, ap); } @@ -490,18 +490,18 @@ { assert(L_tmpnam >= strlen("/tmp/tnXXXXXX")); - + static char buffer[L_tmpnam + 1]; if (s == NULL) { s = buffer; } - + strcpy(s, "/tmp/tnXXXXXX"); mktemp(s); - + if (*s == '\0') { /* Errno set by mktemp(). */ return NULL; } - + return s; } @@ -518,23 +518,23 @@ /* Sequence number of the filename. */ static int seq = 0; - + size_t dir_len = strlen(dir); if (dir[dir_len - 1] == '/') { dir_len--; } - + size_t pfx_len = strlen(pfx); if (pfx_len > 5) { pfx_len = 5; } - + char *result = malloc(dir_len + /* slash*/ 1 + pfx_len + /* three-digit seq */ 3 + /* .tmp */ 4 + /* nul */ 1); - + if (result == NULL) { errno = ENOMEM; return NULL; } - + char *res_ptr = result; strncpy(res_ptr, dir, dir_len); @@ -542,8 +542,8 @@ strncpy(res_ptr, pfx, pfx_len); res_ptr += pfx_len; - + for (; seq < 1000; ++seq) { snprintf(res_ptr, 8, "%03d.tmp", seq); - + int orig_errno = errno; errno = EOK; @@ -559,5 +559,5 @@ } } - + if (seq == 1000) { free(result); @@ -565,5 +565,5 @@ return NULL; } - + return result; } @@ -585,5 +585,5 @@ return NULL; } - + /* Unlink the created file, so that it's removed on close(). */ unlink(filename); Index: uspace/lib/posix/src/stdio/scanf.c =================================================================== --- uspace/lib/posix/src/stdio/scanf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/stdio/scanf.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -459,5 +459,5 @@ { assert(modifier); - + switch (c) { case 'S': @@ -880,5 +880,5 @@ } else if (is_seq_conv(*fmt, &length_mod)) { /* Character sequence conversion. */ - + /* Check sanity of optional parts of conversion specifier. */ if (length_mod != LMOD_NONE && @@ -1074,5 +1074,5 @@ ++converted_cnt; } - + converting = false; /* Format string pointer already incremented. */ @@ -1102,5 +1102,5 @@ break; } - + } else { @@ -1152,5 +1152,5 @@ } } - + } Index: uspace/lib/posix/src/stdlib.c =================================================================== --- uspace/lib/posix/src/stdlib.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/stdlib.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -165,5 +165,5 @@ } } - + return NULL; } @@ -225,12 +225,12 @@ assert(resolved == NULL); #endif - + if (name == NULL) { errno = EINVAL; return NULL; } - + // TODO: symlink resolution - + /* Function absolutize is implemented in libc and declared in vfs.h. * No more processing is required as HelenOS doesn't have symlinks @@ -239,5 +239,5 @@ */ char* absolute = vfs_absolutize(name, NULL); - + if (absolute == NULL) { /* POSIX requires some specific errnos to be set @@ -248,5 +248,5 @@ return NULL; } - + if (resolved == NULL) { return absolute; @@ -309,7 +309,7 @@ { int fd = -1; - + char *tptr = tmpl + strlen(tmpl) - 6; - + while (fd < 0) { if (*mktemp(tmpl) == '\0') { @@ -317,7 +317,7 @@ return -1; } - + fd = open(tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); - + if (fd == -1) { /* Restore template to it's original state. */ @@ -325,5 +325,5 @@ } } - + return fd; } @@ -345,5 +345,5 @@ return tmpl; } - + char *tptr = tmpl + tmpl_len - 6; if (strcmp(tptr, "XXXXXX") != 0) { @@ -352,10 +352,10 @@ return tmpl; } - + static int seq = 0; - + for (; seq < 1000000; ++seq) { snprintf(tptr, 7, "%06d", seq); - + int orig_errno = errno; errno = 0; @@ -372,5 +372,5 @@ } } - + if (seq == 10000000) { errno = EEXIST; @@ -378,5 +378,5 @@ return tmpl; } - + return tmpl; } @@ -392,20 +392,20 @@ { assert(nelem > 0); - + size_t count; load_t *loads = stats_get_load(&count); - + if (loads == NULL) { return -1; } - + if (((size_t) nelem) < count) { count = nelem; } - + for (size_t i = 0; i < count; ++i) { loadavg[i] = (double) loads[i]; } - + free(loads); return count; Index: uspace/lib/posix/src/stdlib/strtold.c =================================================================== --- uspace/lib/posix/src/stdlib/strtold.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/stdlib/strtold.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -141,5 +141,5 @@ return mant; } - + if (abs(exp) >> (MAX_POW5 + 1) != 0) { /* Too large exponent. */ @@ -147,5 +147,5 @@ return exp < 0 ? LDBL_MIN : HUGE_VALL; } - + if (exp < 0) { exp = abs(exp); @@ -175,5 +175,5 @@ } } - + return mant; } @@ -191,10 +191,10 @@ return mant; } - + if (exp > LDBL_MAX_EXP || exp < LDBL_MIN_EXP) { errno = ERANGE; return exp < 0 ? LDBL_MIN : HUGE_VALL; } - + if (exp < 0) { exp = abs(exp); @@ -220,5 +220,5 @@ } } - + return mant; } @@ -242,17 +242,17 @@ assert(sptr != NULL); assert (*sptr != NULL); - + const int DEC_BASE = 10; const char DECIMAL_POINT = '.'; const char EXPONENT_MARK = 'e'; - + const char *str = *sptr; long double significand = 0; long exponent = 0; - + /* number of digits parsed so far */ int parsed_digits = 0; bool after_decimal = false; - + while (isdigit(*str) || (!after_decimal && *str == DECIMAL_POINT)) { if (*str == DECIMAL_POINT) { @@ -261,5 +261,5 @@ continue; } - + if (parsed_digits == 0 && *str == '0') { /* Nothing, just skip leading zeros. */ @@ -270,20 +270,20 @@ exponent++; } - + if (after_decimal) { /* Decrement exponent if we are parsing the fractional part. */ exponent--; } - + str++; } - + /* exponent */ if (tolower(*str) == EXPONENT_MARK) { str++; - + /* Returns MIN/MAX value on error, which is ok. */ long exp = strtol(str, (char **) &str, DEC_BASE); - + if (exponent > 0 && exp > LONG_MAX - exponent) { exponent = LONG_MAX; @@ -294,7 +294,7 @@ } } - + *sptr = str; - + /* Return multiplied by a power of ten. */ return mul_pow2(mul_pow5(significand, exponent), exponent); @@ -330,18 +330,18 @@ { assert(sptr != NULL && *sptr != NULL); - + const int DEC_BASE = 10; const int HEX_BASE = 16; const char DECIMAL_POINT = '.'; const char EXPONENT_MARK = 'p'; - + const char *str = *sptr; long double significand = 0; long exponent = 0; - + /* number of bits parsed so far */ int parsed_bits = 0; bool after_decimal = false; - + while (isxdigit(*str) || (!after_decimal && *str == DECIMAL_POINT)) { if (*str == DECIMAL_POINT) { @@ -350,5 +350,5 @@ continue; } - + if (parsed_bits == 0 && *str == '0') { /* Nothing, just skip leading zeros. */ @@ -359,19 +359,19 @@ exponent += 4; } - + if (after_decimal) { exponent -= 4; } - + str++; } - + /* exponent */ if (tolower(*str) == EXPONENT_MARK) { str++; - + /* Returns MIN/MAX value on error, which is ok. */ long exp = strtol(str, (char **) &str, DEC_BASE); - + if (exponent > 0 && exp > LONG_MAX - exponent) { exponent = LONG_MAX; @@ -382,7 +382,7 @@ } } - + *sptr = str; - + /* Return multiplied by a power of two. */ return mul_pow2(significand, exponent); @@ -407,17 +407,17 @@ { assert(nptr != NULL); - + const int RADIX = '.'; - + /* minus sign */ bool negative = false; /* current position in the string */ int i = 0; - + /* skip whitespace */ while (isspace(nptr[i])) { i++; } - + /* parse sign */ switch (nptr[i]) { @@ -428,10 +428,10 @@ i++; } - + /* check for NaN */ if (strncasecmp(&nptr[i], "nan", 3) == 0) { // FIXME: return NaN // TODO: handle the parenthesised case - + if (endptr != NULL) { *endptr = (char *) nptr; @@ -440,5 +440,5 @@ return 0; } - + /* check for Infinity */ if (strncasecmp(&nptr[i], "inf", 3) == 0) { @@ -447,5 +447,5 @@ i += 5; } - + if (endptr != NULL) { *endptr = (char *) &nptr[i]; @@ -459,5 +459,5 @@ (nptr[i + 2] == RADIX && isxdigit(nptr[i + 3])))) { i += 2; - + const char *ptr = &nptr[i]; /* this call sets errno if appropriate. */ @@ -468,5 +468,5 @@ return negative ? -result : result; } - + /* check for a decimal number */ if (isdigit(nptr[i]) || (nptr[i] == RADIX && isdigit(nptr[i + 1]))) { @@ -479,5 +479,5 @@ return negative ? -result : result; } - + /* nothing to parse */ if (endptr != NULL) { Index: uspace/lib/posix/src/string.c =================================================================== --- uspace/lib/posix/src/string.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/string.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -62,5 +62,5 @@ ++s1; } - + return (char *) s1; } @@ -107,5 +107,5 @@ for (size_t i = 0; ; ++i) { dest[i] = src[i]; - + if (src[i] == '\0') { /* pointer to the terminating nul character */ @@ -113,5 +113,5 @@ } } - + /* unreachable */ return NULL; @@ -133,5 +133,5 @@ for (size_t i = 0; i < n; ++i) { dest[i] = src[i]; - + /* the standard requires that nul characters * are appended to the length of n, in case src is shorter @@ -145,5 +145,5 @@ } } - + return &dest[n]; } @@ -197,11 +197,11 @@ assert(dest != NULL); assert(src != NULL); - + unsigned char* bdest = dest; const unsigned char* bsrc = src; - + for (size_t i = 0; i < n; ++i) { bdest[i] = bsrc[i]; - + if (bsrc[i] == (unsigned char) c) { /* pointer to the next byte */ @@ -209,5 +209,5 @@ } } - + return NULL; } @@ -301,7 +301,7 @@ { assert(mem != NULL); - + const unsigned char *s = mem; - + for (size_t i = 0; i < n; ++i) { if (s[i] == (unsigned char) c) { @@ -323,5 +323,5 @@ { assert(s != NULL); - + char *res = gnu_strchrnul(s, c); return (*res == c) ? res : NULL; @@ -339,7 +339,7 @@ { assert(s != NULL); - + const char *ptr = strchr(s, '\0'); - + /* the same as in strchr, except it loops in reverse direction */ while (*ptr != (char) c) { @@ -365,9 +365,9 @@ { assert(s != NULL); - + while (*s != c && *s != '\0') { s++; } - + return (char *) s; } @@ -439,20 +439,20 @@ assert(haystack != NULL); assert(needle != NULL); - + /* Special case - needle is an empty string. */ if (needle[0] == '\0') { return (char *) haystack; } - + /* Preprocess needle. */ size_t nlen = strlen(needle); size_t prefix_table[nlen + 1]; - + { size_t i = 0; ssize_t j = -1; - + prefix_table[i] = j; - + while (i < nlen) { while (j >= 0 && needle[i] != needle[j]) { @@ -463,16 +463,16 @@ } } - + /* Search needle using the precomputed table. */ size_t npos = 0; - + for (size_t hpos = 0; haystack[hpos] != '\0'; ++hpos) { while (npos != 0 && haystack[hpos] != needle[npos]) { npos = prefix_table[npos]; } - + if (haystack[hpos] == needle[npos]) { npos++; - + if (npos == nlen) { return (char *) (haystack + hpos - nlen + 1); @@ -480,5 +480,5 @@ } } - + return NULL; } @@ -604,7 +604,7 @@ { assert(buf != NULL); - + char *errstr = strerror(errnum); - + if (strlen(errstr) + 1 > bufsz) { return ERANGE; @@ -625,5 +625,5 @@ { assert(s != NULL); - + return (size_t) (strchr(s, '\0') - s); } @@ -639,12 +639,12 @@ { assert(s != NULL); - + for (size_t sz = 0; sz < n; ++sz) { - + if (s[sz] == '\0') { return sz; } } - + return n; } Index: uspace/lib/posix/src/strings.c =================================================================== --- uspace/lib/posix/src/strings.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/strings.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -110,10 +110,10 @@ return cmp; } - + if (s1[i] == 0) { return 0; } } - + return 0; } Index: uspace/lib/posix/src/sys/mman.c =================================================================== --- uspace/lib/posix/src/sys/mman.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/sys/mman.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -44,11 +44,11 @@ if (!start) start = AS_AREA_ANY; - + // if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE))) // return MAP_FAILED; - + if (!(flags & MAP_ANONYMOUS)) return MAP_FAILED; - + return as_area_create(start, length, prot, AS_AREA_UNPAGED); } Index: uspace/lib/posix/src/sys/stat.c =================================================================== --- uspace/lib/posix/src/sys/stat.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/sys/stat.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -52,8 +52,8 @@ { memset(dest, 0, sizeof(struct stat)); - + dest->st_dev = src->service; dest->st_ino = src->index; - + /* HelenOS doesn't support permissions, so we set them all */ dest->st_mode = S_IRWXU | S_IRWXG | S_IRWXO; @@ -64,5 +64,5 @@ dest->st_mode |= S_IFDIR; } - + dest->st_nlink = src->lnkcnt; dest->st_size = src->size; Index: uspace/lib/posix/src/sys/wait.c =================================================================== --- uspace/lib/posix/src/sys/wait.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/posix/src/sys/wait.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -95,13 +95,13 @@ assert(stat_ptr != NULL); assert(options == 0 /* None of the options are supported. */); - + task_exit_t texit; int retval; - + if (failed(task_wait_task_id((task_id_t) pid, &texit, &retval))) { /* Unable to retrieve status. */ return (pid_t) -1; } - + if (texit == TASK_EXIT_NORMAL) { // FIXME: relies on application not returning this value @@ -112,5 +112,5 @@ *stat_ptr = INT_MIN; } - + return pid; }