Changeset 1678

Timestamp:

Dec 2, 2004, 7:41:20 AM (21 years ago)

Author:

bird

Message:

rename reimplementation.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• src/lib/io/rename.c (added)
• src/lib/misc/mkdir.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsDirCreate.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsDirRemove.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsFileStatFH.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsRename.c (added)
• src/lib/sys/b_fsSymlinkRead.c (modified) (1 diff, 1 prop)
• src/lib/sys/rename.c (modified) (1 diff, 1 prop)

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

@@ -289 +289 @@
 int __libc_Back_fsFileStatFH(int fh, struct stat *pStat);
 
+/**
+ * Renames a file or directory.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pszPathOld      Old file path.
+ * @param   pszPathNew      New file path.
+ *
+ * @remark OS/2 doesn't preform the deletion of the pszPathNew atomically.
+ */
+int __libc_Back_fsRename(const char *pszPathOld, const char *pszPathNew);
 
 /** @defgroup __libc_Back_io   LIBC Backend - I/O and File Management.

trunk/src/emx/src/lib/misc/mkdir.c

@@ +1 @@
+/* $Id: $ */
+/** @file
+ *
+ * mkdir.
+ *
+ * Copyright (c) 2004 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
+ *
+ */
 
 /*******************************************************************************

trunk/src/emx/src/lib/sys/b_fsDirCreate.c

@@ -38 +38 @@
 #include <errno.h>
 #include <InnoTekLIBC/backend.h>
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_FS
 #include <InnoTekLIBC/logstrict.h>
 

trunk/src/emx/src/lib/sys/b_fsDirRemove.c

@@ -36 +36 @@
 #include <errno.h>
 #include <InnoTekLIBC/backend.h>
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_FS
 #include <InnoTekLIBC/logstrict.h>
 

trunk/src/emx/src/lib/sys/b_fsFileStatFH.c

@@ -44 +44 @@
 #include <InnoTekLIBC/libc.h>
 #include <InnoTekLIBC/backend.h>
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_FS
 #include <InnoTekLIBC/logstrict.h>
 

trunk/src/emx/src/lib/sys/b_fsSymlinkRead.c

@@ -34 +34 @@
 #include <errno.h>
 #include <InnoTekLIBC/backend.h>
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_FS
 #include <InnoTekLIBC/logstrict.h>
 

trunk/src/emx/src/lib/sys/rename.c

@@ -1 @@
-/* sys/rename.c (emx+gcc) -- Copyright (c) 1992-1996 by Eberhard Mattes
-                          -- Copyright (c) 2003-2004 by knut st. osmundsen */
-
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#include "libc-alias.h"
-#define INCL_FSMACROS
-#include <os2emx.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <emx/syscalls.h>
-#include "syscalls.h"
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO
-#include <InnoTekLIBC/logstrict.h>
-#include <InnoTekLIBC/pathrewrite.h>
-
-int _STD(rename)(const char *pszOldName, const char *pszNewName)
-{
-    LIBCLOG_ENTER("pszOldName=%s pszNewName=%s\n", pszOldName, pszNewName);
-    ULONG   rc;
-    int     cch;
-    FS_VAR();
-
-    /*
-     * Rewrite the specified paths.
-     */
-    cch = __libc_PathRewrite(pszOldName, NULL, 0);
-    if (cch > 0)
-    {
-        char *pszRewritten = alloca(cch);
-        if (!pszRewritten)
-        {
-            errno = ENOMEM;
-            LIBCLOG_RETURN_INT(-1);
-        }
-        cch = __libc_PathRewrite(pszOldName, pszRewritten, cch);
-        if (cch > 0)
-            pszOldName = pszRewritten;
-        /* else happens when someone changes the rules between the two calls. */
-        else if (cch < 0)
-        {
-            errno = EAGAIN;             /* non-standard, I'm sure. */
-            LIBCLOG_RETURN_INT(-1);
-        }
-    }
-
-    cch = __libc_PathRewrite(pszNewName, NULL, 0);
-    if (cch > 0)
-    {
-        char *pszRewritten = alloca(cch);
-        if (!pszRewritten)
-        {
-            errno = ENOMEM;
-            LIBCLOG_RETURN_INT(-1);
-        }
-        cch = __libc_PathRewrite(pszNewName, pszRewritten, cch);
-        if (cch > 0)
-            pszNewName = pszRewritten;
-        /* else happens when someone changes the rules between the two calls. */
-        else if (cch < 0)
-        {
-            errno = EAGAIN;             /* non-standard, I'm sure. */
-            LIBCLOG_RETURN_INT(-1);
-        }
-    }
-
-    /*
-     * Rename it.
-     */
-    FS_SAVE_LOAD();
-    rc = DosMove((PCSZ)pszOldName, (PCSZ)pszNewName);
-    FS_RESTORE();
-    if (rc)
-    {
-        _sys_set_errno(rc);
-        LIBCLOG_RETURN_INT(-1);
-    }
-    LIBCLOG_RETURN_INT(0);
-}
+/* dead */