generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-02-13 22:51:53 +01:00
Code Issues Projects Releases Wiki Activity

Move fmtcheck and fgetln declarations to <bsd/stdio.h>

Browse Source 
This is were they are located on the BSDs.
This commit is contained in:
Guillem Jover 2009-12-11 23:24:31 +01:00
parent ca28f28046
commit 7a70f1b019
4 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -60,6 +60,7 @@ LIB_INCLUDES := \
bsd/md5.h \ bsd/md5.h \
bsd/string.h \ bsd/string.h \
bsd/bsd.h \ bsd/bsd.h \
bsd/stdio.h \
bsd/stdlib.h \ bsd/stdlib.h \
bsd/readpassphrase.h \ bsd/readpassphrase.h \
bsd/unistd.h \ bsd/unistd.h \

40
include/bsd/stdio.h Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright © 2004, 2005, 2009 Guillem Jover
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef LIBBSD_STDIO_H
#define LIBBSD_STDIO_H
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
__BEGIN_DECLS
const char *fmtcheck(const char *, const char *);
char *fgetln(FILE *fp, size_t *lenp);
__END_DECLS
#endif

5
include/bsd/stdlib.h
View File

@ -37,7 +37,8 @@
/* For compatibility with NetBSD, which defines humanize_number here. */ /* For compatibility with NetBSD, which defines humanize_number here. */
#include <libutil.h> #include <libutil.h>
/* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */ /* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
#include <bsd/stdio.h>
#include <bsd/unistd.h> #include <bsd/unistd.h>
__BEGIN_DECLS __BEGIN_DECLS
@ -47,8 +48,6 @@ void arc4random_addrandom(u_char *dat, int datlen);
int dehumanize_number(const char *str, int64_t *size); int dehumanize_number(const char *str, int64_t *size);
const char *fmtcheck (const char *, const char *);
char *getprogname (); char *getprogname ();
void setprogname (char *); void setprogname (char *);

6
include/bsd/string.h
View File

@ -29,13 +29,13 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h>
#include <stdio.h> /* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
#include <bsd/stdio.h>
__BEGIN_DECLS __BEGIN_DECLS
size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz);
size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz);
char *fgetln(FILE *fp, size_t *lenp);
void strmode(mode_t mode, char *str); void strmode(mode_t mode, char *str);
__END_DECLS __END_DECLS