Changeset 528 for trunk/client/src/ndpsmb.c

Timestamp:

Jan 24, 2011, 12:04:13 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: more errno fixes

File:

• trunk/client/src/ndpsmb.c (modified) (1 diff)

trunk/client/src/ndpsmb.c

@@ -966 +966 @@
                                 }
                         }
-                        else
-                        {
+                        
+                        if (rc == NO_ERROR)                     {
                                 finfo.easize = -1;
                                 getfindinfoL(pConn, plist, &finfo, 0, NULL);
                         }
-                        if (rc == ERROR_FILE_NOT_FOUND)
+                        else if (rc == ERROR_FILE_NOT_FOUND)
                         {
                                 // now try the upper path
-                                char * p = ph->fsphStrChr(finfo.fname, '\\');
+                                char * p = ph->fsphStrRChr(finfo.fname, '\\');
                                 if (p && p > finfo.fname)
                                 {
                                         *p = 0;
                                         rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
-                                        if (rc)
+                                        debuglocal(9,"NdpQueryPathInfo upper path in <%s>, rc = %d\n",  finfo.fname, rc);
+                                        if (rc == NO_ERROR)
                                         {       
-                                            debuglocal(9,"NdpQueryPathInfo upper path in <%s>, retry = %d\n",  finfo.fname, retry);
-                                            rc = rc ? ERROR_PATH_NOT_FOUND : ERROR_INVALID_PARAMETER;
+                                            rc = (finfo.attr & FILE_DIRECTORY) !=0 ?
+                                                ERROR_PATH_NOT_FOUND :
+                                                ERROR_INVALID_PARAMETER;
+                                        }
+                                        else if (rc != ERROR_REM_NOT_LIST)
+                                        {
+                                              rc = ERROR_PATH_NOT_FOUND;
                                         }
                                 }