From 4b0b7ca249bfa4ecc099c2ca56527eb91776f198 Mon Sep 17 00:00:00 2001 From: ticktock35 Date: Sun, 14 Dec 2008 23:25:08 -0500 Subject: opkg: re-arrange source code into sub-directories git-svn-id: http://opkg.googlecode.com/svn/trunk@33 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- (limited to 'sprintf_alloc.c') diff --git a/sprintf_alloc.c b/sprintf_alloc.c deleted file mode 100644 index 1d53b20..0000000 --- a/sprintf_alloc.c +++ /dev/null @@ -1,73 +0,0 @@ -/* sprintf_alloc.c -- like sprintf with memory allocation - - Carl D. Worth - - Copyright (C) 2001 University of Southern California - - 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 "opkg.h" -#include - -#include "sprintf_alloc.h" - -int sprintf_alloc(char **str, const char *fmt, ...) -{ - va_list ap; - char *new_str; - int n, size = 100; - - if (!str) { - fprintf(stderr, "Null string pointer passed to sprintf_alloc\n"); - return -1; - } - if (!fmt) { - fprintf(stderr, "Null fmt string passed to sprintf_alloc\n"); - return -1; - } - - /* On x86_64 systems, any strings over 100 were segfaulting. - It seems that the ap needs to be reinitalized before every - use of the v*printf() functions. I pulled the functionality out - of vsprintf_alloc and combined it all here instead. - */ - - - /* ripped more or less straight out of PRINTF(3) */ - - if ((new_str = malloc(size)) == NULL) - return -1; - - *str = new_str; - while(1) { - va_start(ap, fmt); - n = vsnprintf (new_str, size, fmt, ap); - va_end(ap); - /* If that worked, return the size. */ - if (n > -1 && n < size) - return n; - /* Else try again with more space. */ - if (n > -1) /* glibc 2.1 */ - size = n+1; /* precisely what is needed */ - else /* glibc 2.0 */ - size *= 2; /* twice the old size */ - new_str = realloc(new_str, size); - if (new_str == NULL) { - free(new_str); - *str = NULL; - return -1; - } - *str = new_str; - } - - return -1; /* Just to be correct - it probably won't get here */ -} -- cgit v0.9.1