minit

commit cbf3cece21a369005e0f2de6956729e1e99b469c
parent 7ae61bb85943506b67fbcb941349a2eeca182975
Author: leitner <leitner>
Date:   Mon, 26 May 2003 22:27:15 +0000

update str_len -> strlen

Diffstat:
M
Makefile
 | 
25
++++++++++++++++++++++++-
M
str.h
 | 
5
+++++
M
str_len.c
 | 
1
+

3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ shutdown: shutdown.o split.o openreadclose.o
 	$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^
 
 %.o: %.c
-	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $^
+	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
 
 clean:
 	rm -f *.o minit msvc pidfilehack hard-reboot write_proc killall5 \
@@ -63,3 +63,26 @@ tar: clean rename
 rename:
 	if test $(CURNAME) != $(VERSION); then cd .. && mv $(CURNAME) $(VERSION); fi
 
+buffer_1.o: buffer_1.c buffer.h
+buffer_2.o: buffer_2.c buffer.h
+buffer_flush.o: buffer_flush.c buffer.h
+buffer_put.o: buffer_put.c byte.h buffer.h
+buffer_putflush.o: buffer_putflush.c buffer.h
+buffer_puts.o: buffer_puts.c str.h buffer.h
+buffer_putsflush.o: buffer_putsflush.c str.h buffer.h
+buffer_putulong.o: buffer_putulong.c buffer.h fmt.h
+buffer_stubborn.o: buffer_stubborn.c buffer.h
+byte_copy.o: byte_copy.c byte.h
+fmt_ulong.o: fmt_ulong.c fmt.h
+hard-reboot.o: hard-reboot.c
+killall5.o: killall5.c
+minit.o: minit.c fmt.h str.h
+msvc.o: msvc.c str.h fmt.h buffer.h
+openreadclose.o: openreadclose.c
+pidfilehack.o: pidfilehack.c
+shutdown.o: shutdown.c
+split.o: split.c
+str_len.o: str_len.c str.h
+str_start.o: str_start.c str.h
+t.o: t.c
+write_proc.o: write_proc.c
diff --git a/str.h b/str.h
@@ -27,8 +27,13 @@ extern int str_diff(const char *a,const char *b) __pure__;
  * limit characters match. */
 extern int str_diffn(const char *a,const char *b,unsigned int limit) __pure__;
 
+#ifdef __dietlibc__
+#include <string.h>
+#define str_len(foo) strlen(foo)
+#else
 /* str_len returns the index of \0 in s */
 extern unsigned int str_len(const char *s) __pure__;
+#endif
 
 /* str_chr returns the index of the first occurance of needle or \0 in haystack */
 extern unsigned int str_chr(const char *haystack,char needle) __pure__;
diff --git a/str_len.c b/str_len.c
@@ -1,6 +1,7 @@
 #include "str.h"
 
 #ifdef __dietlibc__
+#undef str_len
 unsigned int str_len(const char* in) __attribute__((alias("strlen")));
 #else
 unsigned int str_len(const char* in) {