[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1555 -
From:       codesite-noreply () google ! com
Date:       2008-05-12 15:46:05
Message-ID: 0016e64f51ae13c05b044d0a728a () google ! com
[Download RAW message or body]

Author: lionel.tricon
Date: Mon May 12 08:42:32 2008
New Revision: 1555

Modified:
   trunk/client/trunk/CIsofsUtl/main.cpp

Log:
Removed the recursive resolution of symlinks since it appears that we 
can go into an endless loop.


Modified: trunk/client/trunk/CIsofsUtl/main.cpp
==============================================================================
--- trunk/client/trunk/CIsofsUtl/main.cpp	(original)
+++ trunk/client/trunk/CIsofsUtl/main.cpp	Mon May 12 08:42:32 2008
@@ -91,13 +91,6 @@
         {
             (void)recurs_display(*v_iter);
         }
-
-        // resolve the link before jumping into the directory
-        if (Recursiveflag && isLink)
-        {
-            string followLink = IsoUtl->GetRealPath(*v_iter,IsoUtl->GetLinkInfo(*v_iter));
-            if (IsoUtl->IsDir(followLink)) (void)recurs_display(followLink);
-        }
     }
 }

@@ -129,7 +122,7 @@
         }
     }

-    if (argc!=2 && (isofile==NULL || Helpflag || (!listdir && !readfile)))
+    if (Helpflag || (argc!=2 && (isofile==NULL || (!listdir && !readfile))))
     {
         fprintf(stderr, "cmginfo %s\n", RELEASE);
          fprintf(stderr, "list a directory : %s [-h] -f cmgfile [-r] -l 
directory [-v]\n", argv[0]);
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]