changed some debug levels

[samba.git] / source3 / smbwrapper / smbw_stat.c

diff --git a/source3/smbwrapper/smbw_stat.c b/source3/smbwrapper/smbw_stat.c
index 5362f3a6cb62a0db394c87def216234fa56343cd..adf973667f08ed912ffddc7d7120b01ff74130e0 100644 (file)
--- a/source3/smbwrapper/smbw_stat.c
+++ b/source3/smbwrapper/smbw_stat.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "wrapper.h"
 
 extern int DEBUGLEVEL;
 
@@ -33,6 +32,8 @@ setup basic info in a stat structure
 void smbw_setup_stat(struct stat *st, char *fname, size_t size, int mode)
 {
        ZERO_STRUCTP(st);
+       
+       st->st_mode = 0;
 
        if (IS_DOS_DIR(mode)) {
                st->st_mode = SMBW_DIR_MODE;
@@ -40,6 +41,11 @@ void smbw_setup_stat(struct stat *st, char *fname, size_t size, int mode)
                st->st_mode = SMBW_FILE_MODE;
        }
 
+       if (IS_DOS_ARCHIVE(mode)) st->st_mode |= S_IXUSR;
+       if (IS_DOS_SYSTEM(mode)) st->st_mode |= S_IXGRP;
+       if (IS_DOS_HIDDEN(mode)) st->st_mode |= S_IXOTH;
+       if (!IS_DOS_READONLY(mode)) st->st_mode |= S_IWUSR;
+
        st->st_size = size;
        st->st_blksize = 512;
        st->st_blocks = (size+511)/512;
@@ -57,18 +63,18 @@ BOOL smbw_getatr(struct smbw_server *srv, char *path,
                 uint32 *mode, size_t *size, 
                 time_t *c_time, time_t *a_time, time_t *m_time)
 {
-       DEBUG(5,("sending qpathinfo\n"));
-
-       if (cli_qpathinfo(&srv->cli, path, c_time, a_time, m_time,
-                         size, mode)) return True;
+       DEBUG(4,("sending qpathinfo\n"));
 
-       DEBUG(5,("qpathinfo OK\n"));
+       if (!srv->no_pathinfo2 &&
+           cli_qpathinfo2(&srv->cli, path, c_time, a_time, m_time, NULL,
+                          size, mode)) return True;
 
        /* if this is NT then don't bother with the getatr */
        if (srv->cli.capabilities & CAP_NT_SMBS) return False;
 
        if (cli_getatr(&srv->cli, path, mode, size, m_time)) {
                a_time = c_time = m_time;
+               srv->no_pathinfo2 = True;
                return True;
        }
        return False;
@@ -117,8 +123,8 @@ int smbw_fstat(int fd, struct stat *st)
 {
        struct smbw_file *file;
        time_t c_time, a_time, m_time;
-       uint32 size;
-       int mode;
+       size_t size;
+       uint32 mode;
 
        smbw_busy++;
 
@@ -129,6 +135,8 @@ int smbw_fstat(int fd, struct stat *st)
                return ret;
        }
 
+       DEBUG(4,("sending qfileinfo\n"));
+
        if (!cli_qfileinfo(&file->srv->cli, file->f->cli_fd, 
                          &mode, &size, &c_time, &a_time, &m_time) &&
            !cli_getattrE(&file->srv->cli, file->f->cli_fd, 
@@ -167,6 +175,8 @@ int smbw_stat(const char *fname, struct stat *st)
                return -1;
        }
 
+       DEBUG(4,("stat(%s)\n", fname));
+
        smbw_init();
 
        smbw_busy++;
@@ -181,6 +191,8 @@ int smbw_stat(const char *fname, struct stat *st)
                goto failed;
        }
 
+       DEBUG(4,("smbw_stat\n"));
+
        if (strncmp(srv->cli.dev,"IPC",3) == 0) {
                mode = aDIR | aRONLY;
        } else if (strncmp(srv->cli.dev,"LPT",3) == 0) {
@@ -213,5 +225,3 @@ int smbw_stat(const char *fname, struct stat *st)
        smbw_busy--;
        return -1;
 }
-
-