Changeset 1780

Timestamp:

Jan 17, 2005, 4:57:36 AM (21 years ago)

Author:

bird

Message:

fixed unlink and remove, making them work with dirs and symlinks.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• src/lib/io/remove.c (added)
• src/lib/io/unlink.c (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsUnlink.c (added)
• src/lib/sys/remove.c (deleted)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -300 +300 @@
  */
 int __libc_Back_fsRename(const char *pszPathOld, const char *pszPathNew);
+
+/**
+ * Unlinks a file, directory, symlink, dev, pipe or socket.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPath         Path to the filesystem file/dir/symlink/whatever to remove.
+ */
+int __libc_Back_fsUnlink(const char *pszPath);
+
 
 /** @defgroup __libc_Back_io   LIBC Backend - I/O and File Management.

trunk/src/emx/src/lib/io/unlink.c

@@ -1 @@
-/* unlink.c (emx+gcc) -- Copyright (c) 1990-1996 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * unlink().
+ *
+ * Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
+ *
+ *
+ * This file is part of InnoTek LIBC.
+ *
+ * InnoTek LIBC 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 of the License, or
+ * (at your option) any later version.
+ *
+ * InnoTek LIBC 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 InnoTek LIBC; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "libc-alias.h"
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
 #include <io.h>
-#include <emx/syscalls.h>
+#include <InnoTekLIBC/backend.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_IO
+#include <InnoTekLIBC/logstrict.h>
 
-int _STD(unlink) (const char *name)
+
+/**
+ * Unlinks file, directory, symlink, dev, socket or fifo.
+ *
+ * @returns 0 on success.
+ * @returns -1 and errno on failure.
+ * @param   pszPath     File/dir/whatever to remove.
+ * @remark  OS/2 doesn't support removal of dev, socket or fifo disk structures ATM.
+ */
+int _STD(unlink)(const char *pszPath)
 {
-  return remove (name);       /* There are no links */
+    LIBCLOG_ENTER("pszFile=%s\n", pszPath);
+    int rc = __libc_Back_fsUnlink(pszPath);
+    if (!rc)
+        LIBCLOG_RETURN_INT(0);
+    errno = -rc;
+    LIBCLOG_RETURN_INT(-1);
 }
+

trunk/src/emx/src/lib/libc.def

@@ -1372 +1372 @@
     "__std_wcstok" @1386
     "__std_wcswidth" @1387
+    "___libc_Back_fsUnlink" @1388