Changeset 968

Timestamp:

Aug 19, 2016, 3:27:58 PM (9 years ago)

Author:

Yuri Dario

Message:

Use a better name for getfindinfoL() since its task changed. Remove
getfindinfo().

Location:

trunk/client/src

Files:

• ndpsmb.c (modified) (7 diffs)
• smbwrp.c (modified) (1 diff)
• smbwrp.h (modified) (1 diff)

trunk/client/src/ndpsmb.c

@@ -232 +232 @@
 }
 
-
-void getfindinfo(Connection * pConn, FILEFINDBUF3 * stat, smbwrp_fileinfo * finfo)
-{
-        char * name = ph->fsphStrRChr(finfo->fname, '\\');
-
-        if (name)
-           name++;
-        else
-           name = finfo->fname;
-
-        if (!*name)
-           name = pConn->pRes->srv.share_name;
-
-        strncpy(stat->achName, name, CCHMAXPATHCOMP - 1);
-        stat->cbFile = finfo->size;
-        stat->cbFileAlloc = stat->cbFile;
-        stat->oNextEntryOffset = 0ul;
-        stat->cchName = strlen(stat->achName);
-        stat->attrFile = (finfo->attr & 0x37);
-
-        fsphUnixTimeToDosDate(pConn->pRes, finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
-        fsphUnixTimeToDosDate(pConn->pRes, finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
-        fsphUnixTimeToDosDate(pConn->pRes, finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
-        return;
-}
-
-int getfindinfoL(Connection * pConn, void * plist, smbwrp_fileinfo * finfo, ULONG ulAttribute, char * mask)
+//
+// maps smbwrp_fileinfo data fields into a native OS/2 file informations
+// and add the result to Netdrive internal list
+//
+int addFindInfoL(Connection * pConn, void * plist, smbwrp_fileinfo * finfo, ULONG ulAttribute, char * mask)
 {
         FILESTATUS3L stat = {0};
@@ -361 +339 @@
         pRes->krb5support = 0;
 #endif
-        pRes->pdc = NULL;
         pRes->loglevel = 0;
 
@@ -500 +477 @@
          * the above values come from the gui. default: timeout 10; listings: 32
         */
-        dircache_create(&pRes->pdc, (void*) pRes,
+        dircache_create(pRes->pdc, (void*) pRes,
                         pRes->cachetimeout, pRes->cachedepth);
 
@@ -969 +946 @@
                  rc = NO_ERROR;
                  finfo.easize = -1;
-                 getfindinfoL(pConn, plist, &finfo, 0, NULL);
+                 addFindInfoL(pConn, plist, &finfo, 0, NULL);
                  break;
               }
@@ -1028 +1005 @@
            {
               finfo.easize = -1;
-              getfindinfoL(pConn, plist, &finfo, 0, NULL);
+              addFindInfoL(pConn, plist, &finfo, 0, NULL);
            }
            else if (rc == ERROR_FILE_NOT_FOUND)
@@ -1121 +1098 @@
         /*
          * This plugin always reads a complete directory listing and 
-         * filters results using actual mask (state.dir_mask) in getfindinfoL.
+         * filters results using actual mask (state.dir_mask) in addFindInfoL.
          * May be this was a workaround for some server bug.
          * If this will be changed, then directory listing cache must 
@@ -1839 +1816 @@
            {
               finfo.easize = -1;
-              getfindinfoL(pConn, plist, &finfo, 0, NULL);
+              addFindInfoL(pConn, plist, &finfo, 0, NULL);
            }
         } while (0);

trunk/client/src/smbwrp.c

@@ -730 +730 @@
            strncat(fullname, finfo->fname, sizeof(fullname) - strlen(fullname) -1);
            strncpy(st->finfo.fname, fullname, sizeof(st->finfo.fname));
-           getfindinfoL(st->pConn, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
+           addFindInfoL(st->pConn, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
         }
         return;

trunk/client/src/smbwrp.h

@@ -206 +206 @@
 void smbwrp_initthread(void);
 
+/* wrapper around fsphAddFile32L */
+int addFindInfoL(Connection *pConn, void *plist, smbwrp_fileinfo *finfo,
+                 ULONG ulAttribute, char *mask);
+
 #endif /* _SMBWRP_H */