Added getcwd and dirname

git-svn-id: svn://kolibrios.org@8879 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2021-06-19 20:17:05 +00:00
parent 136d626dfa
commit 0d7bb871e6
5 changed files with 94 additions and 4 deletions

View File

@ -325,7 +325,8 @@ STRING_SRCS= \
wmemcmp.c \ wmemcmp.c \
wmemcpy.c \ wmemcpy.c \
wmemmove.c \ wmemmove.c \
wmemset.c wmemset.c \
dirname.c
STDIO_SRCS= \ STDIO_SRCS= \
@ -600,8 +601,8 @@ $(NAME).dll: $(LIB_OBJS) $(SRC_DEP) Makefile
install: libc.dll libc.dll.a libdll.a install: libc.dll libc.dll.a libdll.a
mv -f libc.dll $(SDK_DIR)/bin mv -f libc.dll $(SDK_DIR)/bin
mv -f libc.dll.a $(INSTALLDIR) mv -f libc.dll.a $(INSTALLDIR)/lib
mv -f libdll.a $(INSTALLDIR) mv -f libdll.a $(INSTALLDIR)/lib
libdll.a: $(LIBDLL_OBJS) Makefile libdll.a: $(LIBDLL_OBJS) Makefile
$(AR) $(ARFLAGS) libdll.a $(LIBDLL_OBJS) $(AR) $(ARFLAGS) libdll.a $(LIBDLL_OBJS)

View File

@ -14,3 +14,13 @@ int chdir(char* dir){
_ksys_setcwd(dir); _ksys_setcwd(dir);
return 0; return 0;
} }
char *getcwd(char *buf, unsigned size){
if(!buf){
if((buf = malloc(size))==NULL){
return NULL;
}
}
_ksys_getcwd(buf, size);
return(buf);
}

View File

@ -107,4 +107,14 @@ int _ksys_free(void *mem)
return val; return val;
} }
static inline
int _ksys_getcwd(char* buf, int bufsize){
register int val;
asm_inline(
"int $0x40"
:"=a"(val):"a"(30), "b"(2), "c"(buf), "d"(bufsize)
);
return val;
}
#endif #endif

View File

@ -518,3 +518,5 @@ EXPORTS
mkdir mkdir
rmdir rmdir
chdir chdir
dirname
getcwd

View File

@ -0,0 +1,67 @@
/* dirname - return directory part of PATH.
Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <libgen.h>
#include <string.h>
char *
dirname (char *path)
{
static const char dot[] = ".";
char *last_slash;
/* Find last '/'. */
last_slash = path != NULL ? strrchr (path, '/') : NULL;
if (last_slash != NULL && last_slash != path && last_slash[1] == '\0')
{
/* Determine whether all remaining characters are slashes. */
char *runp;
for (runp = last_slash; runp != path; --runp)
if (runp[-1] != '/')
break;
/* The '/' is the last character, we have to look further. */
if (runp != path)
last_slash = memrchr (path, '/', runp - path);
}
if (last_slash != NULL)
{
/* Determine whether all remaining characters are slashes. */
char *runp;
for (runp = last_slash; runp != path; --runp)
if (runp[-1] != '/')
break;
/* Terminate the path. */
if (runp == path)
{
/* The last slash is the first character in the string. We have to
return "/". As a special case we have to return "//" if there
are exactly two slashes at the beginning of the string. See
XBD 4.10 Path Name Resolution for more information. */
if (last_slash == path + 1)
++last_slash;
else
last_slash = path + 1;
}
else
last_slash = runp;
last_slash[0] = '\0';
}
else
/* This assignment is ill-designed but the XPG specs require to
return a string containing "." in any case no directory part is
found and so a static and constant string is required. */
path = (char *) dot;
return path;
}