Fixed some Linux stuff

Author: dd86k

src/dfile.d

@@ -1869,69 +1869,71 @@ version (Windows) {
 /// Report a symbolic link.
 void report_link()
 {
-    report("Soft symbolic link");
-
+    enum LINK = "Soft symbolic link";
     version (Windows)
-    { // Works half the time, see the Wiki post.
-    version (Symlink)
-    {
-        HANDLE hFile;
-        DWORD returnedLength;
-        WIN32_SYMLINK_REPARSE_DATA_BUFFER buffer;
-
-        const char* p = &linkname[0];
-        SECURITY_ATTRIBUTES* sa; // Default
-
-        hFile = CreateFileA(p, GENERIC_READ, 0u,
-            sa, OPEN_EXISTING,
-            FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, cast(void*)0);
-        if (hFile == INVALID_HANDLE_VALUE) { //TODO: Check why LDC2 fails here.
-            /* Error creating directory */
-            /* TclWinConvertError(GetLastError()); */
-            return;
-        }
-        /* Get the link */
-        if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, NULL, 0, &buffer,
-                WIN32_SYMLINK_REPARSE_DATA_BUFFER.sizeof, &returnedLength, NULL)) {
-                /* Error setting junction */
+    { 
+        report(LINK);
+        // Works half the time, see the Wiki post.
+        version (Symlink)
+        {
+            HANDLE hFile;
+            DWORD returnedLength;
+            WIN32_SYMLINK_REPARSE_DATA_BUFFER buffer;
+
+            const char* p = &linkname[0];
+            SECURITY_ATTRIBUTES* sa; // Default
+
+            hFile = CreateFileA(p, GENERIC_READ, 0u,
+                sa, OPEN_EXISTING,
+                FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, cast(void*)0);
+            if (hFile == INVALID_HANDLE_VALUE) { //TODO: Check why LDC2 fails here.
+                /* Error creating directory */
                 /* TclWinConvertError(GetLastError()); */
-                CloseHandle(hFile);
                 return;
             }
+            /* Get the link */
+            if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, NULL, 0, &buffer,
+                    WIN32_SYMLINK_REPARSE_DATA_BUFFER.sizeof, &returnedLength, NULL)) {
+                    /* Error setting junction */
+                    /* TclWinConvertError(GetLastError()); */
+                    CloseHandle(hFile);
+                    return;
+                }
 
-        CloseHandle(hFile);
+            CloseHandle(hFile);
 
-        if (!IsReparseTagValid(buffer.ReparseTag)) {
-            /* Tcl_SetErrno(EINVAL); */
-            return;
-        }
+            if (!IsReparseTagValid(buffer.ReparseTag)) {
+                /* Tcl_SetErrno(EINVAL); */
+                return;
+            }
 
-        DWORD wstrlen(const(void)* p) {
-            DWORD s;
-            wchar* wp = cast(wchar*)p;
-            while (*wp++ != wchar.init) ++s;
-            return s;
-        }
+            DWORD wstrlen(const(void)* p) {
+                DWORD s;
+                wchar* wp = cast(wchar*)p;
+                while (*wp++ != wchar.init) ++s;
+                return s;
+            }
 
-        printf(" to ");
-        stdout.flush; // on x86-dmd builds, used to move cursor
-        const(void)* wp = &buffer.ReparseTarget[2];
-        DWORD c;
-        WriteConsoleW(
-            GetStdHandle(STD_OUTPUT_HANDLE),
-            wp,
-            wstrlen(wp) / 2,
-            &c,
-            cast(void*)0
-        );
-    } // version (Symlink)
+            printf(" to ");
+            stdout.flush; // on x86-dmd builds, used to move cursor
+            const(void)* wp = &buffer.ReparseTarget[2];
+            DWORD c;
+            WriteConsoleW(
+                GetStdHandle(STD_OUTPUT_HANDLE),
+                wp,
+                wstrlen(wp) / 2,
+                &c,
+                cast(void*)0
+            );
+        } // version (Symlink)
     } // version (Windows)
     version (Posix)
     {
         import core.stdc.stdio : printf;
         import core.sys.posix.stdlib : realpath;
-        char* p = realpath(&linkname[0], cast(char*)0);
-        if (p) printf(" to %s", p);
+        report(LINK, false);
+        char* p = realpath(&filename[0], cast(char*)0);
+        if (p) printf(" to %s\n", p);
     }
 }
 

src/main.d

@@ -115,7 +115,7 @@ void prescan(string path, bool cont)
     version (Posix) {
         import core.sys.posix.sys.stat :
             S_IFBLK, S_IFCHR, S_IFIFO, S_IFREG, S_IFDIR, S_IFLNK, S_IFSOCK, S_IFMT;
-        if ((a & S_IFMT) == S_IFLNK)
+        if (a & S_IFLNK)
             if (cont)
                 goto FILE;
             else
@@ -134,16 +134,16 @@ FILE:
             debug dbg("Closing file...");
             fclose(fp);
         }
-        else if (a & S_IFBLK)
-            reportfile("Block", filename);
         else if (a & S_IFCHR)
-            reportfile("Character special", filename);
+            report("Character special");
+        else if (a & S_IFBLK)
+            report("Block");
         else if (a & S_IFSOCK)
-            reportfile("Socket", filename);
+            report("Socket");
         else if (a & S_IFDIR)
-            reportfile("Directory", filename);
+            report("Directory");
         else
-            report_unknown(filename);
+            report_unknown;
     } else version (Windows) { // Windows
         import core.sys.windows.winnt :
             FILE_ATTRIBUTE_DIRECTORY, FILE_ATTRIBUTE_REPARSE_POINT;