Patchwork libpayload standard headers

login
register
about
Submitter Stefan Reinauer
Date 2010-07-09 17:34:46
Message ID <4C375DB6.8020205@coresystems.de>
Download mbox | patch
Permalink /patch/1599/
State Accepted
Headers show

Comments

Stefan Reinauer - 2010-07-09 17:34:46
See patch
become more standard with libpayload headers. PATH_MAX belongs in limits.h,
tiny curses can use standard includes now.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Patrick Georgi - 2010-07-09 18:10:39
Am 09.07.2010 19:34, schrieb Stefan Reinauer:
>  See patch
> 
Acked-by: Patrick Georgi <patrick@georgi-clan.de>

Patch

Index: include/limits.h
===================================================================
--- include/limits.h	(revision 0)
+++ include/limits.h	(revision 0)
@@ -0,0 +1,43 @@ 
+/*
+ * This file is part of the libpayload project.
+ *
+ * Copyright (C) 2010 coresystems GmbH
+ *
+ * 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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 _LIMITS_H
+#define _LIMITS_H
+
+#ifndef PATH_MAX
+# if defined(_POSIX_PATH_MAX)
+#  define PATH_MAX _POSIX_PATH_MAX
+# elif defined(MAXPATHLEN)
+#  define PATH_MAX MAXPATHLEN
+# else
+#  define PATH_MAX 255	/* the Posix minimum path-size */
+# endif
+#endif
+
+#endif
Index: include/libpayload.h
===================================================================
--- include/libpayload.h	(revision 5662)
+++ include/libpayload.h	(working copy)
@@ -342,10 +342,6 @@ 
 struct LFILE *lfopen(struct LAR *lar, const char *filename);
 int lfread(void *ptr, size_t size, size_t nmemb, struct LFILE *stream);
 
-#define SEEK_SET 0 /**< The seek offset is absolute. */
-#define SEEK_CUR 1 /**< The seek offset is against the current position. */
-#define SEEK_END 2 /**< The seek offset is against the end of the file. */
-
 int lfseek(struct LFILE *stream, long offset, int whence);
 int lfclose(struct LFILE *file);
 /** @} */
Index: include/stdio.h
===================================================================
--- include/stdio.h	(revision 5662)
+++ include/stdio.h	(working copy)
@@ -43,4 +43,9 @@ 
 
 void perror(const char *s);
 
+#define SEEK_SET 0 /**< The seek offset is absolute. */
+#define SEEK_CUR 1 /**< The seek offset is against the current position. */
+#define SEEK_END 2 /**< The seek offset is against the end of the file. */
+
+
 #endif
Index: include/curses.priv.h
===================================================================
--- include/curses.priv.h	(revision 5662)
+++ include/curses.priv.h	(working copy)
@@ -46,9 +46,6 @@ 
 #ifndef _CURSES_PRIV_H
 #define _CURSES_PRIV_H 1
 
-//// XXX
-extern void *memset(void *s, int c, size_t len);
-
 //// #include <ncurses_dll.h>
 
 #ifdef __cplusplus
@@ -63,29 +60,29 @@ 
 #define MODULE_ID(id) /*nothing*/
 #endif
 
-//// #include <stdlib.h>
-//// #include <string.h>
-//// #include <sys/types.h>
-////
-//// #if HAVE_UNISTD_H
-//// #include <unistd.h>
-//// #endif
-////
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 //// #if HAVE_SYS_BSDTYPES_H
 //// #include <sys/bsdtypes.h>	/* needed for ISC */
 //// #endif
-////
-//// #if HAVE_LIMITS_H
-//// # include <limits.h>
+
+#if HAVE_LIMITS_H
+# include <limits.h>
 //// #elif HAVE_SYS_PARAM_H
 //// # include <sys/param.h>
-//// #endif
+#endif
 ////
 //// #include <assert.h>
-//// #include <stdio.h>
-////
-//// #include <errno.h>
+#include <stdio.h>
 
+#include <errno.h>
+
 #ifndef PATH_MAX
 # if defined(_POSIX_PATH_MAX)
 #  define PATH_MAX _POSIX_PATH_MAX
Index: curses/local.h
===================================================================
--- curses/local.h	(revision 5662)
+++ curses/local.h	(working copy)
@@ -46,6 +46,8 @@ 
 #define NCURSES_NO_PADDING 0
 #define USE_HARD_TABS 0
 #define HAVE_FCNTL_H 0
+#define HAVE_LIMITS_H 1
+#define HAVE_UNISTD_H 1
 #define USE_XMC_SUPPORT 0
 #define NCURSES_EXPANDED 0
 #define HAVE_GETCWD 0