c0299e1868
I re-indented the source code using indent with the following options: indent -kr -bad -bap -nut -i8 -l80 -psl -sob -ss -ncs There are now _no_ tabs in the source files, and all indentation is eight spaces. Lines are 80 characters long, and the procedure type is on it's own line. Read the indent manual for more information about what each option means.
109 lines
3.0 KiB
C
109 lines
3.0 KiB
C
/* $Id: text.c,v 1.5 2005-08-15 03:54:31 rjkaes Exp $
|
|
*
|
|
* The functions included here are useful for text manipulation. They
|
|
* replace or augment the standard C string library. These functions
|
|
* are either safer replacements, or they provide services not included
|
|
* with the standard C string library.
|
|
*
|
|
* Copyright (C) 2002 Robert James Kaes (rjkaes@users.sourceforge.net)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2, or (at your option) any
|
|
* later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
|
|
#include "tinyproxy.h"
|
|
|
|
#include "text.h"
|
|
|
|
#ifndef HAVE_STRLCPY
|
|
/*
|
|
* Function API taken from OpenBSD. Like strncpy(), but does not 0 fill the
|
|
* buffer, and always NULL terminates the buffer. size is the size of the
|
|
* destination buffer.
|
|
*/
|
|
size_t
|
|
strlcpy(char *dst, const char *src, size_t size)
|
|
{
|
|
size_t len = strlen(src);
|
|
size_t ret = len;
|
|
|
|
if (len >= size)
|
|
len = size - 1;
|
|
|
|
memcpy(dst, src, len);
|
|
dst[len] = '\0';
|
|
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
#ifndef HAVE_STRLCAT
|
|
/*
|
|
* Function API taken from OpenBSD. Like strncat(), but does not 0 fill the
|
|
* buffer, and always NULL terminates the buffer. size is the length of the
|
|
* buffer, which should be one more than the maximum resulting string
|
|
* length.
|
|
*/
|
|
size_t
|
|
strlcat(char *dst, const char *src, size_t size)
|
|
{
|
|
size_t len1 = strlen(dst);
|
|
size_t len2 = strlen(src);
|
|
size_t ret = len1 + len2;
|
|
|
|
if (len1 + len2 >= size)
|
|
len2 = size - len1 - 1;
|
|
if (len2 > 0) {
|
|
memcpy(dst + len1, src, len2);
|
|
dst[len1 + len2] = '\0';
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Removes any new-line or carriage-return characters from the end of the
|
|
* string. This function is named after the same function in Perl.
|
|
* "length" should be the number of characters in the buffer, not including
|
|
* the trailing NULL.
|
|
*
|
|
* Returns the number of characters removed from the end of the string. A
|
|
* negative return value indicates an error.
|
|
*/
|
|
ssize_t
|
|
chomp(char *buffer, size_t length)
|
|
{
|
|
size_t chars;
|
|
|
|
assert(buffer != NULL);
|
|
assert(length > 0);
|
|
|
|
/* Make sure the arguments are valid */
|
|
if (buffer == NULL)
|
|
return -EFAULT;
|
|
if (length < 1)
|
|
return -ERANGE;
|
|
|
|
chars = 0;
|
|
|
|
--length;
|
|
while (buffer[length] == '\r' || buffer[length] == '\n') {
|
|
buffer[length] = '\0';
|
|
chars++;
|
|
|
|
/* Stop once we get to zero to prevent wrap-around */
|
|
if (length-- == 0)
|
|
break;
|
|
}
|
|
|
|
return chars;
|
|
}
|