X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=macro.h;h=8d904dfc4d740447465a898eb6e1a11694f92b60;hp=9bb1f2961f67d80f43ddb97a974e4124e08381a2;hb=79bd731c0db3e3202cfeed2af3fb217ae744b70f;hpb=a54078ccf090907f1ebd9ddc3a02cd613ffecf9c

diff --git a/macro.h b/macro.h
index 9bb1f29..8d904df 100644
--- a/macro.h
+++ b/macro.h
@@ -11,28 +11,28 @@
 \*****************************************************************************/ 
 
 
-/* save strcpy/strncpy */
+/* safe strcpy/strncpy */
 
-#define SCPY(dst, src) scpy(dst, src, sizeof(dst))
-extern __inline__ void scpy(char *dst, char *src, unsigned int siz)
+#define SCPY(dst, src) scpy((char *)dst, src, sizeof(dst))
+static inline void scpy(char *dst, const char *src, unsigned int siz)
 {
 	strncpy(dst, src, siz);
 	dst[siz-1] = '\0';
 }
 
-/* save strcat/strncat */
+/* safe strcat/strncat */
 
-#define SCAT(dst, src) scat(dst, src, sizeof(dst))
-extern __inline__ void scat(char *dst, char *src, unsigned int siz)
+#define SCAT(dst, src) scat((char *)dst, src, sizeof(dst))
+static inline void scat(char *dst, const char *src, unsigned int siz)
 {
-	strncat(dst, src, siz);
+	strncat(dst, src, siz-strlen(dst)-1);
 	dst[siz-1] = '\0';
 }
 
-/* save concat of a byte */
+/* safe concat of a byte */
 
-#define SCCAT(dst, src) sccat(dst, src, sizeof(dst))
-extern __inline__ void sccat(char *dst, char chr, unsigned int siz)
+#define SCCAT(dst, src) sccat((char *)dst, src, sizeof(dst))
+static inline void sccat(char *dst, char chr, unsigned int siz)
 {
 	if (strlen(dst) < siz-1)
 	{
@@ -41,10 +41,10 @@ extern __inline__ void sccat(char *dst, char chr, unsigned int siz)
 	}
 }
 
-/* save sprintf/snprintf */
+/* safe sprintf/snprintf */
 
-#define SPRINT(dst, fmt, arg...) sprint(dst, sizeof(dst), fmt, ## arg)
-extern __inline__ void sprint(char *dst, unsigned int siz, char *fmt, ...)
+#define SPRINT(dst, fmt, arg...) sprint((char *)dst, sizeof(dst), fmt, ## arg)
+static inline void sprint(char *dst, unsigned int siz, const char *fmt, ...)
 {
 	va_list args;
 
@@ -54,7 +54,7 @@ extern __inline__ void sprint(char *dst, unsigned int siz, char *fmt, ...)
 	va_end(args);
 }
 
-/* unsave */
+/* unsafe */
 #define UCPY strcpy
 #define UNCPY strncpy
 #define UCAT strcat
@@ -63,9 +63,9 @@ extern __inline__ void sprint(char *dst, unsigned int siz, char *fmt, ...)
 #define UNPRINT snprintf
 #define VUNPRINT vsnprintf
 
+#define FATAL(fmt, arg...) _fatal(__FILE__, __FUNCTION__, __LINE__, fmt, ##arg)
 /* fatal error with error message and exit */
-#define FATAL(fmt, arg...) fatal(__FUNCTION__, __LINE__, fmt, ##arg)
-extern __inline__ void fatal(const char *function, int line, char *fmt, ...)
+static inline void _fatal(const char *file, const char *function, int line, const char *fmt, ...)
 {
 	va_list args;
 	char buffer[256];
@@ -74,34 +74,52 @@ extern __inline__ void fatal(const char *function, int line, char *fmt, ...)
 	vsnprintf(buffer, sizeof(buffer), fmt, args);
 	va_end(args);
 	buffer[sizeof(buffer)-1] = '\0';
-	fprintf(stderr, "FATAL ERROR in function %s, line %d: %s", function, line, buffer);
+	fprintf(stderr, "FATAL ERROR in function %s/%s, line %d: %s", file, function, line, buffer);
 	fprintf(stderr, "This error is not recoverable, must exit here.\n");
 #ifdef DEBUG_FUNC
-	debug(function, line, "FATAL ERROR", buffer);
-	debug(function, line, "FATAL ERROR", "This error is not recoverable, must exit here.\n");
+	debug(file, function, line, "FATAL", buffer);
+	debug(file, function, line, "FATAL", (char *)"This error is not recoverable, must exit here.\n");
 #endif
 	exit(EXIT_FAILURE);
 }
 
 /* memory allocation with setting to zero */
-#define MALLOC(size) _malloc(size, __FUNCTION__, __LINE__)
-extern __inline__ void *_malloc(unsigned long size, const char *function, int line)
+#define MALLOC(size) _malloc(size, __FILE__, __FUNCTION__, __LINE__)
+static inline void *_malloc(unsigned int size, const char *file, const char *function, int line)
 {
 	void *addr;
 	addr = malloc(size);
 	if (!addr)
-		fatal(function, line, "No memory for %d bytes.\n", size);
+		_fatal(file, function, line, "No memory for %d bytes.\n", size);
 	memset(addr, 0, size);
-	return(addr);
+	return addr;
 }
 
 /* memory freeing with clearing memory to prevent using freed memory */
 #define FREE(addr, size) _free(addr, size)
-extern __inline void _free(void *addr, int size)
+static inline void _free(void *addr, int size)
 {
 	if (size)
 		memset(addr, 0, size);
 	free(addr);
 }
 
+/* fill buffer and be sure that it's result is 0-terminated, also remove newline */
+#define GETLINE(buffer, fp) _getline(buffer, sizeof(buffer), fp)
+static inline char *_getline(char *buffer, int size, FILE *fp)
+{
+	if (!fgets(buffer, size-1, fp))
+		return NULL;
+	buffer[size-1] = '\0';
+	if (!buffer[0])
+		return buffer;
+	if (buffer[strlen(buffer)-1] == '\n')
+		buffer[strlen(buffer)-1] = '\0';
+	if (!buffer[0])
+		return buffer;
+	if (buffer[strlen(buffer)-1] == '\r')
+		buffer[strlen(buffer)-1] = '\0';
+	return buffer;
+}
+