X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flink.c;h=b58eb25bc38596bc80a3f13b241b24b19e4ac6cf;hb=17f0ec6;hp=72b860015a1fbfb9145ad4409c13f85994861bdd;hpb=2d9360ffcc03fac61415d14595fd76e6abb59db3;p=gnulib.git

diff --git a/lib/link.c b/lib/link.c
index 72b860015..b58eb25bc 100644
--- a/lib/link.c
+++ b/lib/link.c
@@ -1,6 +1,6 @@
 /* Emulate link on platforms that lack it, namely native Windows platforms.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,19 +33,19 @@
 
 /* CreateHardLink was introduced only in Windows 2000.  */
 typedef BOOL (WINAPI * CreateHardLinkFuncType) (LPCTSTR lpFileName,
-						LPCTSTR lpExistingFileName,
-						LPSECURITY_ATTRIBUTES lpSecurityAttributes);
+                                                LPCTSTR lpExistingFileName,
+                                                LPSECURITY_ATTRIBUTES lpSecurityAttributes);
 static CreateHardLinkFuncType CreateHardLinkFunc = NULL;
 static BOOL initialized = FALSE;
 
 static void
 initialize (void)
 {
-  HMODULE kernel32 = LoadLibrary ("kernel32.dll");
+  HMODULE kernel32 = GetModuleHandle ("kernel32.dll");
   if (kernel32 != NULL)
     {
       CreateHardLinkFunc =
-	(CreateHardLinkFuncType) GetProcAddress (kernel32, "CreateHardLinkA");
+        (CreateHardLinkFuncType) GetProcAddress (kernel32, "CreateHardLinkA");
     }
   initialized = TRUE;
 }
@@ -103,39 +103,39 @@ link (const char *file1, const char *file2)
        * system. */
       DWORD err = GetLastError ();
       switch (err)
-	{
-	case ERROR_ACCESS_DENIED:
-	  errno = EACCES;
-	  break;
-
-	case ERROR_INVALID_FUNCTION:	/* fs does not support hard links */
-	  errno = EPERM;
-	  break;
-
-	case ERROR_NOT_SAME_DEVICE:
-	  errno = EXDEV;
-	  break;
-
-	case ERROR_PATH_NOT_FOUND:
-	case ERROR_FILE_NOT_FOUND:
-	  errno = ENOENT;
-	  break;
-
-	case ERROR_INVALID_PARAMETER:
-	  errno = ENAMETOOLONG;
-	  break;
-
-	case ERROR_TOO_MANY_LINKS:
-	  errno = EMLINK;
-	  break;
-
-	case ERROR_ALREADY_EXISTS:
-	  errno = EEXIST;
-	  break;
-
-	default:
-	  errno = EIO;
-	}
+        {
+        case ERROR_ACCESS_DENIED:
+          errno = EACCES;
+          break;
+
+        case ERROR_INVALID_FUNCTION:    /* fs does not support hard links */
+          errno = EPERM;
+          break;
+
+        case ERROR_NOT_SAME_DEVICE:
+          errno = EXDEV;
+          break;
+
+        case ERROR_PATH_NOT_FOUND:
+        case ERROR_FILE_NOT_FOUND:
+          errno = ENOENT;
+          break;
+
+        case ERROR_INVALID_PARAMETER:
+          errno = ENAMETOOLONG;
+          break;
+
+        case ERROR_TOO_MANY_LINKS:
+          errno = EMLINK;
+          break;
+
+        case ERROR_ALREADY_EXISTS:
+          errno = EEXIST;
+          break;
+
+        default:
+          errno = EIO;
+        }
       return -1;
     }
 
@@ -155,18 +155,30 @@ link (const char *file1, const char *file2)
 int
 rpl_link (char const *file1, char const *file2)
 {
+  size_t len1;
+  size_t len2;
+  struct stat st;
+
+  /* Don't allow IRIX to dereference dangling file2 symlink.  */
+  if (!lstat (file2, &st))
+    {
+      errno = EEXIST;
+      return -1;
+    }
+
   /* Reject trailing slashes on non-directories.  */
-  size_t len1 = strlen (file1);
-  size_t len2 = strlen (file2);
+  len1 = strlen (file1);
+  len2 = strlen (file2);
   if ((len1 && file1[len1 - 1] == '/')
       || (len2 && file2[len2 - 1] == '/'))
     {
       /* Let link() decide whether hard-linking directories is legal.
-         If stat() fails, link() will probably fail for the same
-         reason; so we only have to worry about successful stat() and
-         non-directory.  */
-      struct stat st;
-      if (stat (file1, &st) == 0 && !S_ISDIR (st.st_mode))
+         If stat() fails, then link() should fail for the same reason
+         (although on Solaris 9, link("file/","oops") mistakenly
+         succeeds); if stat() succeeds, require a directory.  */
+      if (stat (file1, &st))
+        return -1;
+      if (!S_ISDIR (st.st_mode))
         {
           errno = ENOTDIR;
           return -1;
@@ -176,7 +188,6 @@ rpl_link (char const *file1, char const *file2)
     {
       /* Fix Cygwin 1.5.x bug where link("a","b/.") creates file "b".  */
       char *dir = strdup (file2);
-      struct stat st;
       char *p;
       if (!dir)
         return -1;