libc.obj:

- Added basename() and  dirname()
 - libc_test all tabs -> spaces

git-svn-id: svn://kolibrios.org@9262 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/ktcc/trunk/libc.obj/include/libgen.h

@@ -0,0 +1,7 @@
+#ifndef _LIBGEN_H_
+#define _LIBGEN_H_
+
+extern char* _FUNC(dirname)(char *);
+extern char* _FUNC(basename)(char *);
+
+#endif

programs/develop/ktcc/trunk/libc.obj/samples/libc_test.c

@@ -1,84 +1,88 @@
+#include <sys/ksys.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 int comp(void *a, void *b) {
-	return *(int*)a - *(int*)b;
+    return *(int*)a - *(int*)b;
 }
 
 int main(){
-	puts("Start testing.");
+    puts("Start testing.");
-	assert(NULL == ((void*)0));
+    assert(NULL == ((void*)0));
-	assert(RAND_MAX == 65535);
+    assert(RAND_MAX == 65535);
-	assert(min(3, 10) == 3);
+    assert(min(3, 10) == 3);
-	assert(max(3, 10) == 10);
+    assert(max(3, 10) == 10);
-	assert(atof("12.4") == 12.4);
+    assert(atof("12.4") == 12.4);
-	assert(atoi("-123") == -123);
+    assert(atoi("-123") == -123);
-	assert(atol("-2146483647") == -2146483647L);
+    assert(atol("-2146483647") == -2146483647L);
-	assert(atoll("-9223372036854775806") == -9223372036854775806LL);
+    assert(atoll("-9223372036854775806") == -9223372036854775806LL);
-	assert(!strcmp("123", "123"));
+    assert(!strcmp("123", "123"));
 
-	char st1[32];
+    char st1[32];
-	itoa(-2341, st1);
+    itoa(-2341, st1);
-	assert(!strcmp(st1, "-2341"));
+    assert(!strcmp(st1, "-2341"));
 
-	assert(strlen("12345") == 5);
+    assert(strlen("12345") == 5);
-	assert(abs(4) == 4);
+    assert(abs(4) == 4);
-	assert(abs(-4) == 4);
+    assert(abs(-4) == 4);
-	assert(labs(1000000000) == 1000000000);
+    assert(labs(1000000000) == 1000000000);
-	assert(labs(-1000000000) == 1000000000);
+    assert(labs(-1000000000) == 1000000000);
-	assert(llabs(100000000000) == 100000000000);
+    assert(llabs(100000000000) == 100000000000);
-	assert(llabs(-100000000000) == 100000000000);
+    assert(llabs(-100000000000) == 100000000000);
 
-	div_t output1 = div(27, 4);
+    div_t output1 = div(27, 4);
-	assert(output1.quot == 6);
+    assert(output1.quot == 6);
-	assert(output1.rem == 3);
+    assert(output1.rem == 3);
 
-	ldiv_t output2 = ldiv(27, 4);
+    ldiv_t output2 = ldiv(27, 4);
-	assert(output2.quot == 6);
+    assert(output2.quot == 6);
-	assert(output2.rem == 3);
+    assert(output2.rem == 3);
 
-	lldiv_t output3 = lldiv(27, 4);
+    lldiv_t output3 = lldiv(27, 4);
-	assert(output3.quot == 6);
+    assert(output3.quot == 6);
-	assert(output3.rem == 3);
+    assert(output3.rem == 3);
 
-	char *st2 = malloc(sizeof(char)*2);
+    char *st2 = malloc(sizeof(char)*2);
-	assert(st2 != NULL);
+    assert(st2 != NULL);
-	st2[0] = 'H';
+    st2[0] = 'H';
-	st2[1] = 'i';
+    st2[1] = 'i';
-	st2 = realloc(st2, sizeof(char)*3);
+    st2 = realloc(st2, sizeof(char)*3);
-	st2[2] = '!';
+    st2[2] = '!';
-	assert(!strcmp(st2, "Hi!"));
+    assert(!strcmp(st2, "Hi!"));
-	free(st2);
+    free(st2);
 
-	st2 = calloc(2, sizeof(char));
+    st2 = calloc(2, sizeof(char));
-	assert(st2 != NULL);
+    assert(st2 != NULL);
-	st2[0] = 'H';
+    st2[0] = 'H';
-	st2[1] = 'i';
+    st2[1] = 'i';
-	assert(!strcmp(st2, "Hi"));
+    assert(!strcmp(st2, "Hi"));
-	free(st2);
+    free(st2);
 
-	char *start = "100.00 Rub";
+    char *start = "100.00 Rub";
-	char *end;
+    char *end;
-	assert(strtol(start, &end, 10) == 100L);
+    assert(strtol(start, &end, 10) == 100L);
-	assert(!strcmp(end, ".00 Rub"));
+    assert(!strcmp(end, ".00 Rub"));
 
-	end = NULL;
+    end = NULL;
-	assert(strtod(start, &end) == 100.0);
+    assert(strtod(start, &end) == 100.0);
-	assert(!strcmp(end, " Rub"));
+    assert(!strcmp(end, " Rub"));
 
-	// rand ¨ srand ¯à®¢¥à¥­ë ¢àãç­ãî :3
+    char *st3 = "21.3e3Hello World!";
+    assert(atof(st3) == 21300.0);
 
-	char *st3 = "21.3e3Hello World!";
+    int nums[10] = {5, 3, 9, 1, 8, 4, 2, 0, 7, 6};
-	assert(atof(st3) == 21300.0);
+    qsort(nums, 10, sizeof(int), (int(*) (const void *, const void *))comp);
+    for (int i = 0;  i < 10; i++) {
+        assert(nums[i] == i);
+    }
+    
+    time_t libc_time = time(NULL);
+    struct tm *libc_tm = localtime(&libc_time);
+    printf(asctime(libc_tm));
 
-	int nums[10] = {5, 3, 9, 1, 8, 4, 2, 0, 7, 6};
+    puts("End testing.");
-	qsort(nums, 10, sizeof(int), (int(*) (const void *, const void *))comp);
+    exit(0);
-	for (int i = 0;  i < 10; i++) {
+}
-		assert(nums[i] == i);
-	}
-
-	puts("End testing.");
-	exit(0);
-}

programs/develop/ktcc/trunk/libc.obj/source/libc.c

@@ -116,6 +116,9 @@
 #include "time/time.c"
 #include "time/asctime.c"
 
+#include "misc/basename.c"
+#include "misc/dirname.c"
+
 __asm__(
     ".include \"math/acos.s\"\n\t"
     ".include \"math/asin.s\"\n\t"

programs/develop/ktcc/trunk/libc.obj/source/misc/basename.c

@@ -0,0 +1,13 @@
+#include <string.h>
+#include <libgen.h>
+
+char *basename(char *s)
+{
+    size_t i;
+    if (!s || !*s) return ".";
+    i = strlen(s)-1;
+    for (; i&&s[i]=='/'; i--) s[i] = 0;
+    for (; i&&s[i-1]!='/'; i--);
+    return s+i;
+}
+ 

programs/develop/ktcc/trunk/libc.obj/source/misc/dirname.c

@@ -0,0 +1,14 @@
+#include <string.h>
+#include <libgen.h>
+
+char *dirname(char *s)
+{
+    size_t i;
+    if (!s || !*s) return ".";
+    i = strlen(s)-1;
+    for (; s[i]=='/'; i--) if (!i) return "/";
+    for (; s[i]!='/'; i--) if (!i) return ".";
+    for (; s[i]=='/'; i--) if (!i) return "/";
+    s[i+1] = 0;
+    return s;
+} 

programs/develop/ktcc/trunk/libc.obj/source/symbols.txt

@@ -172,3 +172,6 @@ time
 localtime
 asctime
 difftime
+!____MISC____
+basename
+dirname