aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--com32/include/syslinux/pmapi.h1
-rw-r--r--com32/lib/getcwd.c23
-rw-r--r--core/fs/getcwd.c13
-rw-r--r--core/include/fs.h3
-rw-r--r--core/pmapi.c1
5 files changed, 20 insertions, 21 deletions
diff --git a/com32/include/syslinux/pmapi.h b/com32/include/syslinux/pmapi.h
index f1036dfd..c325b62b 100644
--- a/com32/include/syslinux/pmapi.h
+++ b/com32/include/syslinux/pmapi.h
@@ -69,6 +69,7 @@ struct com32_pmapi {
void (*reset_idle)(void);
int (*chdir)(const char *);
+ char *(*getcwd)(char *, size_t);
};
#endif /* _SYSLINUX_PMAPI_H */
diff --git a/com32/lib/getcwd.c b/com32/lib/getcwd.c
index 38fae52a..5ce62ec0 100644
--- a/com32/lib/getcwd.c
+++ b/com32/lib/getcwd.c
@@ -2,29 +2,10 @@
* getcwd.c
*/
-#include <syslinux/config.h>
-#include <klibc/compiler.h>
#include <com32.h>
-
-#include <dirent.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
+#include <syslinux/pmapi.h>
char *getcwd(char *buf, size_t size)
{
- static com32sys_t reg;
- char *pwdstr, *ret;
-
- reg.eax.w[0] = 0x001f;
- __intcall(0x22, &reg, &reg);
- pwdstr = MK_PTR(reg.es, reg.ebx.w[0]);
- if ((strlen(pwdstr) < size) && (buf != NULL)) {
- strcpy(buf, pwdstr);
- ret = buf;
- } else {
- ret = NULL;
- errno = ERANGE;
- }
- return ret;
+ return __com32.cs_pm->getcwd(buf, size);
}
diff --git a/core/fs/getcwd.c b/core/fs/getcwd.c
new file mode 100644
index 00000000..a7b6c7a9
--- /dev/null
+++ b/core/fs/getcwd.c
@@ -0,0 +1,13 @@
+#include <string.h>
+#include "fs.h"
+
+char *getcwd(char *buf, size_t size)
+{
+ char *ret = NULL;
+
+ if((buf != NULL) && (strlen(this_fs->cwd_name) < size)) {
+ strcpy(buf, this_fs->cwd_name);
+ ret = buf;
+ }
+ return ret;
+}
diff --git a/core/include/fs.h b/core/include/fs.h
index bb629c91..a01f9984 100644
--- a/core/include/fs.h
+++ b/core/include/fs.h
@@ -202,6 +202,9 @@ DIR *opendir(const char *pathname);
struct dirent *readdir(DIR *dir);
int closedir(DIR *dir);
+/* getcwd.c */
+char *getcwd(char *buf, size_t size);
+
/*
* Generic functions that filesystem drivers may choose to use
*/
diff --git a/core/pmapi.c b/core/pmapi.c
index 18693d97..ff655330 100644
--- a/core/pmapi.c
+++ b/core/pmapi.c
@@ -36,4 +36,5 @@ const struct com32_pmapi pm_api_vector =
.reset_idle = reset_idle,
.chdir = chdir,
+ .getcwd = getcwd,
};