X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=macro.h;h=e4a2f2e079e05f5c206a7c8ae0c563a2a8ec683a;hp=ab0716c72886259f0d93db39f0fd0c9f75e9aa02;hb=f854931ffbee9464b278c433c4fdc7c3ea5af2fb;hpb=d2b113f2c4f11acfaee1b2e0fd2f03744a89f6d4

diff --git a/macro.h b/macro.h
index ab0716c..e4a2f2e 100644
--- a/macro.h
+++ b/macro.h
@@ -14,7 +14,7 @@
 /* safe strcpy/strncpy */
 
 #define SCPY(dst, src) scpy(dst, src, sizeof(dst))
-static inline void scpy(char *dst, char *src, unsigned int siz)
+static inline void scpy(char *dst, const char *src, unsigned int siz)
 {
 	strncpy(dst, src, siz);
 	dst[siz-1] = '\0';
@@ -23,9 +23,9 @@ static inline void scpy(char *dst, char *src, unsigned int siz)
 /* safe strcat/strncat */
 
 #define SCAT(dst, src) scat(dst, src, sizeof(dst))
-static inline void scat(char *dst, char *src, unsigned int siz)
+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';
 }
 
@@ -44,7 +44,7 @@ static inline void sccat(char *dst, char chr, unsigned int siz)
 /* safe sprintf/snprintf */
 
 #define SPRINT(dst, fmt, arg...) sprint(dst, sizeof(dst), fmt, ## arg)
-static inline void sprint(char *dst, unsigned int siz, char *fmt, ...)
+static inline void sprint(char *dst, unsigned int siz, const char *fmt, ...)
 {
 	va_list args;
 
@@ -63,9 +63,9 @@ static 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)
-static 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,25 +74,25 @@ static 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__)
-static inline void *_malloc(unsigned int 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 */
@@ -104,4 +104,20 @@ static inline void _free(void *addr, int 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[strlen(buffer)-1] == '\r')
+		buffer[strlen(buffer)-1] = '\0';
+	return buffer;
+}
+