X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=752fb8f945d1a381b7b7af4e65ed56b646df8d47;hp=a6019e30cee2d71f0825e4eae2970b7209d9d74e;hb=3dca24604449f268274e8458fbd5447e55dd7cc8;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde diff --git a/string.c b/string.c index a6019e30..752fb8f9 100644 --- a/string.c +++ b/string.c @@ -4,7 +4,7 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file string.c memory allocation and string handling functions */ +/** \file string.c Memory allocation and string handling functions. */ #include "para.h" #include "string.h" @@ -17,18 +17,18 @@ #include "error.h" /** - * paraslash's version of realloc() + * Paraslash's version of realloc(). * - * \param p pointer to the memory block, may be NULL - * \param size desired new size + * \param p Pointer to the memory block, may be \p NULL. + * \param size The desired new size. * * A wrapper for realloc(3). It calls \p exit(\p EXIT_FAILURE) on errors, * i.e. there is no need to check the return value in the caller. * * \return A pointer to the newly allocated memory, which is suitably aligned - * for any kind of variable and may be different from \p p. + * for any kind of variable and may be different from \a p. * - * \sa realloc(3) + * \sa realloc(3). */ __must_check __malloc void *para_realloc(void *p, size_t size) { @@ -46,16 +46,16 @@ __must_check __malloc void *para_realloc(void *p, size_t size) } /** - * paraslash's version of malloc() + * Paraslash's version of malloc(). * - * \param size desired new size + * \param size The desired new size. * * A wrapper for malloc(3) which exits on errors. * * \return A pointer to the allocated memory, which is suitably aligned for any - * kind of variable. + * kind of variable. * - * \sa malloc(3) + * \sa malloc(3). */ __must_check __malloc void *para_malloc(size_t size) { @@ -71,14 +71,14 @@ __must_check __malloc void *para_malloc(size_t size) } /** - * paraslash's version of calloc() + * Paraslash's version of calloc(). * - * \param size desired new size + * \param size The desired new size. * * A wrapper for calloc(3) which exits on errors. * * \return A pointer to the allocated and zeroed-out memory, which is suitably - * aligned for any kind of variable. + * aligned for any kind of variable. * * \sa calloc(3) */ @@ -91,9 +91,9 @@ __must_check __malloc void *para_calloc(size_t size) } /** - * paraslash's version of strdup() + * Paraslash's version of strdup(). * - * \param s string to be duplicated + * \param s The string to be duplicated. * * A wrapper for strdup(3). It calls \p exit(EXIT_FAILURE) on errors, i.e. * there is no need to check the return value in the caller. @@ -109,14 +109,14 @@ __must_check __malloc char *para_strdup(const char *s) if ((ret = strdup(s? s: ""))) return ret; - PARA_EMERG_LOG("%s", "strdup failed, aborting\n"); + PARA_EMERG_LOG("strdup failed, aborting\n"); exit(EXIT_FAILURE); } /** - * allocate a sufficiently large string and print into it + * Allocate a sufficiently large string and print into it. * - * \param fmt usual format string + * \param fmt A usual format string. * * Produce output according to \p fmt. No artificial bound on the length of the * resulting string is imposed. @@ -124,7 +124,7 @@ __must_check __malloc char *para_strdup(const char *s) * \return This function either returns a pointer to a string that must be * freed by the caller or aborts without returning. * - * \sa printf(3) + * \sa printf(3). */ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...) { @@ -135,17 +135,17 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...) } /** - * paraslash's version of strcat() + * Paraslash's version of strcat(). * - * \param a string to be appended to - * \param b string to append + * \param a String to be appended to. + * \param b String to append. * * Append \p b to \p a. * - * \return If \p a is NULL, return a pointer to a copy of \p b, i.e. - * para_strcat(NULL, b) is equivalent to para_strdup(b). If \p b is NULL, - * return \p a without making a copy of \p a. Otherwise, construct the - * concatenation \p c, free \p a (but not \p b) and return \p c. + * \return If \a a is \p NULL, return a pointer to a copy of \a b, i.e. + * para_strcat(NULL, b) is equivalent to para_strdup(b). If \a b is \p NULL, + * return \a a without making a copy of \a a. Otherwise, construct the + * concatenation \a c, free \a a (but not \a b) and return \a c. * * \sa strcat(3) */ @@ -169,8 +169,8 @@ __must_check __malloc char *para_strcat(char *a, const char *b) * * Compute the directory component of \p name. * - * \return If \p name is \p NULL or the empty string, return \p NULL. - * Otherwise, Make a copy of \p name and return its directory component. Caller + * \return If \a name is \p NULL or the empty string, return \p NULL. + * Otherwise, Make a copy of \a name and return its directory component. Caller * is responsible to free the result. */ __must_check __malloc char *para_dirname(const char *name) @@ -195,7 +195,7 @@ __must_check __malloc char *para_dirname(const char *name) * * Compute the filename component of \a name. * - * \return \p NULL if (a) \a name is the empty string of \p NULL, or (b) name + * \return \p NULL if (a) \a name is the empty string or \p NULL, or (b) name * ends with a slash. Otherwise, a pointer within \a name is returned. Caller * must not free the result. */ @@ -213,9 +213,9 @@ __must_check const char *para_basename(const char *name) } /** - * cut trailing newline + * Cut trailing newline. * - * \param buf the string to be chopped. + * \param buf The string to be chopped. * * Replace the last character in \p buf by zero if it is euqal to * the newline character. @@ -230,14 +230,14 @@ void chop(char *buf) } /** - * get a random filename + * Get a random filename. * * This is by no means a secure way to create temporary files in a hostile * direcory like \p /tmp. However, it is OK to use for temp files, fifos, * sockets that are created in ~/.paraslash. Result must be freed by the * caller. * - * \return a pointer to a random filename. + * \return A pointer to a random filename. */ __must_check __malloc char *para_tmpname(void) { @@ -251,39 +251,13 @@ __must_check __malloc char *para_tmpname(void) } /** - * create unique temporary file - * - * \param template the template to be passed to mkstemp() - * \param mode the desired mode of the tempfile - * - * This wrapper for mkstemp additionally uses fchmod() to - * set the given mode of the tempfile if mkstemp() returned success. - * - * \return The file descriptor of the temp file just created on success. - * On errors, -E_MKSTEMP or -E_FCHMOD is returned. - */ -__must_check int para_mkstemp(char *template, mode_t mode) -{ - int tmp, fd = mkstemp(template); - - if (fd < 0) - return -E_MKSTEMP; - tmp = fchmod(fd, mode); - if (tmp >= 0) - return fd; - close(fd); - unlink(template); - return -E_FCHMOD; -} - -/** - * get the logname of the current user + * Get the logname of the current user. * * \return A dynammically allocated string that must be freed by the caller. On * errors, the string "unknown user" is returned, i.e. this function never - * returns NULL. + * returns \p NULL. * - * \sa getpwuid(3) + * \sa getpwuid(3). */ __must_check __malloc char *para_logname(void) { @@ -292,7 +266,7 @@ __must_check __malloc char *para_logname(void) } /** - * get the home directory of the current user + * Get the home directory of the current user. * * \return A dynammically allocated string that must be freed by the caller. If * the home directory could not be found, this function returns "/tmp". @@ -304,17 +278,16 @@ __must_check __malloc char *para_homedir(void) } /** - * split string and return pointers to its parts. + * Split string and return pointers to its parts. * - * \param args the string to be split - * \param argv_ptr pointer to the list of substrings - * \param delim delimiter + * \param args The string to be split. + * \param argv_ptr Pointer to the list of substrings. + * \param delim Delimiter. * * This function modifies \a args by replacing each occurance of \a delim by * zero. A \p NULL-terminated array of pointers to char* is allocated dynamically * and these pointers are initialized to point to the broken-up substrings - * within \a args. A pointer to this array is returned via \a argv_ptr. It's OK - * to call this function with \a args \a == \p NULL. + * within \a args. A pointer to this array is returned via \a argv_ptr. * * \return The number of substrings found in \a args. */ @@ -355,7 +328,7 @@ __must_check unsigned split_args(char *args, char *** const argv_ptr, const char } /** - * ensure that file descriptors 0, 1, and 2 are valid + * Ensure that file descriptors 0, 1, and 2 are valid. * * Common approach that opens /dev/null until it gets a file descriptor greater * than two. @@ -365,9 +338,7 @@ __must_check unsigned split_args(char *args, char *** const argv_ptr, const char void valid_fd_012(void) { while (1) { - int fd; - - fd = open("/dev/null", O_RDWR); + int fd = open("/dev/null", O_RDWR); if (fd < 0) exit(EXIT_FAILURE); if (fd > 2) { @@ -378,11 +349,11 @@ void valid_fd_012(void) } /** - * get the own hostname + * Get the own hostname. * * \return A dynammically allocated string containing the hostname. * - * \sa uname(2) + * \sa uname(2). */ __malloc char *para_hostname(void) { @@ -513,7 +484,15 @@ int for_each_line_ro(char *buf, size_t size, line_handler_t *line_handler, * * This function prints into the buffer given by \a b at the offset which is * also given by \a b. If there is not enough space to hold the result, the - * buffer size is doubled until the underlying call to vsnprintf() succeeds. + * buffer size is doubled until the underlying call to vsnprintf() succeeds + * or the size of the buffer exceeds the maximal size specified in \a pb. + * + * In the latter case the unmodified \a buf and \a offset values as well as the + * private_data pointer of \a b are passed to the \a max_size_handler of \a b. + * If this function succeeds, i.e. returns a non-negative value, the offset of + * \a b is reset to zero and the given data is written to the beginning of the + * buffer. + * * Upon return, the offset of \a b is adjusted accordingly so that subsequent * calls to this function append data to what is already contained in the * buffer. @@ -534,26 +513,35 @@ __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...) b->buf = para_malloc(128); b->size = 128; b->offset = 0; - } else if (b->size <= b->offset + 1) { - b->size *= 2; - b->buf = para_realloc(b->buf, b->size); } while (1) { char *p = b->buf + b->offset; size_t size = b->size - b->offset; va_list ap; - va_start(ap, fmt); - ret = vsnprintf(p, size, fmt, ap); - va_end(ap); - if (ret > -1 && ret < size) { /* success */ - b->offset += ret; - break; + if (size) { + va_start(ap, fmt); + ret = vsnprintf(p, size, fmt, ap); + va_end(ap); + if (ret > -1 && ret < size) { /* success */ + b->offset += ret; + return ret; + } + } + /* check if we may grow the buffer */ + if (!b->max_size || 2 * b->size < b->max_size) { /* yes */ + /* try again with more space */ + b->size *= 2; + b->buf = para_realloc(b->buf, b->size); + continue; } - /* try again with more space */ - b->size *= 2; - b->buf = para_realloc(b->buf, b->size); + /* can't grow buffer */ + if (!b->offset || !b->max_size_handler) /* message too large */ + return -ERRNO_TO_PARA_ERROR(ENOSPC); + ret = b->max_size_handler(b->buf, b->offset, b->private_data); + if (ret < 0) + return ret; + b->offset = 0; } - return ret; } /** \cond LLONG_MAX and LLONG_LIN might not be defined. */ @@ -571,7 +559,7 @@ __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...) * \param str The string to be converted. * \param value Result pointer. * - * \return Positive on success, negative on errors. + * \return Standard. * * \sa para_atoi32(), strtol(3), atoi(3). */ @@ -600,7 +588,7 @@ int para_atoi64(const char *str, int64_t *value) * \param str The string to be converted. * \param value Result pointer. * - * \return Positive on success, negative on errors. + * \return Standard. * * \sa para_atoi64(). */