X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Flibbb.h;h=4e1fafcaa4cbe24edd34f99161f49d3cd358f1f3;hb=5a23a432b0a45ff4774a9968895ee87d60e70f03;hp=2c9f2f1258d78b1ea829282b1f6e1b4290219047;hpb=677c7152744313ef9b1195862dbf1761b5e3416d;p=oweals%2Fopkg-lede.git

diff --git a/libbb/libbb.h b/libbb/libbb.h
index 2c9f2f1..4e1fafc 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -24,24 +24,34 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-
+#include <stdlib.h>
 #include <netdb.h>
 
-#include <features.h>
+#include "../libopkg/opkg_message.h"
 
+#ifndef FALSE
 #define FALSE   ((int) 0)
+#endif
+
+#ifndef TRUE
 #define TRUE    ((int) 1)
+#endif
+
+#define error_msg(fmt, args...) opkg_msg(ERROR, fmt"\n", ##args)
+#define perror_msg(fmt, args...) opkg_perror(ERROR, fmt, ##args)
+#define error_msg_and_die(fmt, args...) \
+	do { \
+		error_msg(fmt, ##args); \
+		exit(EXIT_FAILURE); \
+	} while (0)
+#define perror_msg_and_die(fmt, args...) \
+	do { \
+		perror_msg(fmt, ##args); \
+		exit(EXIT_FAILURE); \
+	} while (0)
 
-extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
-extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
-extern void perror_msg(const char *s, ...);
-extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
 extern void archive_xread_all(int fd, char *buf, size_t count);
 
-/* These two are used internally -- you shouldn't need to use them */
-extern void verror_msg(const char *s, va_list p);
-extern void vperror_msg(const char *s, va_list p);
-
 const char *mode_string(int mode);
 const char *time_string(time_t timeVal);
 
@@ -94,10 +104,11 @@ enum extract_functions_e {
 };
 
 char *deb_extract(const char *package_filename, FILE *out_stream,
-		const int extract_function, const char *prefix, const char *filename);
+		const int extract_function, const char *prefix,
+		const char *filename, int *err);
 
 extern int unzip(FILE *l_in_file, FILE *l_out_file);
-extern void gz_close(int gunzip_pid);
+extern int gz_close(int gunzip_pid);
 extern FILE *gz_open(FILE *compressed_file, int *pid);
 
 int make_directory (const char *path, long mode, int flags);
@@ -109,7 +120,4 @@ enum {
 	FILEUTILS_FORCE = 8,
 };
 
-extern const char *applet_name;
-extern const char * const memory_exhausted;
-
 #endif /* __LIBBB_H__ */