trying to get HEAD building again. If you want the code

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

diff --git a/source3/smbwrapper/smbw_dir.c b/source3/smbwrapper/smbw_dir.c
index 37926b04076db7b1659d796bf4556fc6b3806c6e..6d55c1d9da2bf30fe9e37d36a608d31442ae6c56 100644 (file)
--- a/source3/smbwrapper/smbw_dir.c
+++ b/source3/smbwrapper/smbw_dir.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.0
+   Unix SMB/CIFS implementation.
    SMB wrapper directory functions
    Copyright (C) Andrew Tridgell 1998
    
@@ -28,7 +27,6 @@ extern fstring smbw_prefix;
 static struct smbw_dir *smbw_dirs;
 
 extern struct bitmap *smbw_file_bmap;
-extern int DEBUGLEVEL;
 
 extern int smbw_busy;
 
@@ -64,32 +62,35 @@ free a smbw_dir structure and all entries
 *******************************************************/
 static void free_dir(struct smbw_dir *dir)
 {
-       if (dir->list) {
-               free(dir->list);
-       }
-       if (dir->path) free(dir->path);
+       if(!dir) return;
+
+       SAFE_FREE(dir->list);
+       SAFE_FREE(dir->path);
        ZERO_STRUCTP(dir);
-       free(dir);
+       SAFE_FREE(dir);
 }
 
-
 static struct smbw_dir *cur_dir;
 
 /***************************************************** 
 add a entry to a directory listing
 *******************************************************/
-static void smbw_dir_add(struct file_info *finfo)
+static void smbw_dir_add(struct file_info *finfo, const char *mask, 
+                        void *state)
 {
+       struct file_info *cdl;
+
        DEBUG(5,("%s\n", finfo->name));
 
        if (cur_dir->malloced == cur_dir->count) {
-               cur_dir->list = (struct file_info *)Realloc(cur_dir->list, 
+               cdl = (struct file_info *)Realloc(cur_dir->list, 
                                                            sizeof(cur_dir->list[0])*
                                                            (cur_dir->count+100));
-               if (!cur_dir->list) {
+               if (!cdl) {
                        /* oops */
                        return;
                }
+               cur_dir->list = cdl;
                cur_dir->malloced += 100;
        }
 
@@ -100,7 +101,8 @@ static void smbw_dir_add(struct file_info *finfo)
 /***************************************************** 
 add a entry to a directory listing
 *******************************************************/
-static void smbw_share_add(const char *share, uint32 type, const char *comment)
+static void smbw_share_add(const char *share, uint32 type, 
+                          const char *comment, void *state)
 {
        struct file_info finfo;
 
@@ -111,7 +113,7 @@ static void smbw_share_add(const char *share, uint32 type, const char *comment)
        pstrcpy(finfo.name, share);
        finfo.mode = aRONLY | aDIR;     
 
-       smbw_dir_add(&finfo);
+       smbw_dir_add(&finfo, NULL, NULL);
 }
 
 
@@ -119,7 +121,7 @@ static void smbw_share_add(const char *share, uint32 type, const char *comment)
 add a server to a directory listing
 *******************************************************/
 static void smbw_server_add(const char *name, uint32 type, 
-                           const char *comment)
+                           const char *comment, void *state)
 {
        struct file_info finfo;
 
@@ -128,7 +130,7 @@ static void smbw_server_add(const char *name, uint32 type,
        pstrcpy(finfo.name, name);
        finfo.mode = aRONLY | aDIR;     
 
-       smbw_dir_add(&finfo);
+       smbw_dir_add(&finfo, NULL, NULL);
 }
 
 
@@ -150,7 +152,7 @@ static void smbw_printjob_add(struct print_job_info *job)
        finfo.mode = aRONLY;
        finfo.size = job->size;
 
-       smbw_dir_add(&finfo);
+       smbw_dir_add(&finfo, NULL, NULL);
 }
 
 
@@ -197,28 +199,47 @@ int smbw_dir_open(const char *fname)
        cur_dir = dir;
 
        slprintf(mask, sizeof(mask)-1, "%s\\*", path);
-       string_sub(mask,"\\\\","\\");
+       all_string_sub(mask,"\\\\","\\",0);
 
-       if ((p=strstr(srv->server_name,"#1D"))) {
+       if ((p=strstr(srv->server_name,"#01"))) {
+               *p = 0;
+               smbw_server_add(".",0,"", NULL);
+               smbw_server_add("..",0,"", NULL);
+               smbw_NetServerEnum(&srv->cli, srv->server_name, 
+                                  SV_TYPE_DOMAIN_ENUM, smbw_server_add, NULL);
+               *p = '#';
+       } else if ((p=strstr(srv->server_name,"#1D"))) {
                DEBUG(4,("doing NetServerEnum\n"));
                *p = 0;
-               cli_NetServerEnum(&srv->cli, srv->server_name, SV_TYPE_ALL,
-                                 smbw_server_add);
+               smbw_server_add(".",0,"", NULL);
+               smbw_server_add("..",0,"", NULL);
+               smbw_NetServerEnum(&srv->cli, srv->server_name, SV_TYPE_ALL,
+                                  smbw_server_add, NULL);
                *p = '#';
-       } else if (strcmp(srv->cli.dev,"IPC") == 0) {
+       } else if ((strcmp(srv->cli.dev,"IPC") == 0) || (strcasecmp(share,"IPC$") == 0)) {
                DEBUG(4,("doing NetShareEnum\n"));
-               if (cli_RNetShareEnum(&srv->cli, smbw_share_add) < 0) {
+               smbw_share_add(".",0,"", NULL);
+               smbw_share_add("..",0,"", NULL);
+               if (smbw_RNetShareEnum(&srv->cli, smbw_share_add, NULL) < 0) {
                        errno = smbw_errno(&srv->cli);
                        goto failed;
                }
        } else if (strncmp(srv->cli.dev,"LPT",3) == 0) {
+               smbw_share_add(".",0,"", NULL);
+               smbw_share_add("..",0,"", NULL);
                if (cli_print_queue(&srv->cli, smbw_printjob_add) < 0) {
                        errno = smbw_errno(&srv->cli);
                        goto failed;
                }
        } else {
+#if 0
+               if (strcmp(path,"\\") == 0) {
+                       smbw_share_add(".",0,"");
+                       smbw_share_add("..",0,"");
+               }
+#endif
                if (cli_list(&srv->cli, mask, aHIDDEN|aSYSTEM|aDIR, 
-                            smbw_dir_add) < 0) {
+                            smbw_dir_add, NULL) < 0) {
                        errno = smbw_errno(&srv->cli);
                        goto failed;
                }
@@ -251,10 +272,8 @@ int smbw_dir_open(const char *fname)
        return dir->fd;
 
  failed:
-       if (dir) {
-               free_dir(dir);
-       }
-
+       free_dir(dir);
+       
        return -1;
 }
 
@@ -351,7 +370,7 @@ int smbw_chdir(const char *name)
        struct smbw_server *srv;
        fstring server, share;
        pstring path;
-       uint32 mode = aDIR;
+       uint16 mode = aDIR;
        char *cwd;
        int len;
 
@@ -393,10 +412,11 @@ int smbw_chdir(const char *name)
                goto failed;
        }
 
-       if (strncmp(srv->cli.dev,"IPC",3) &&
+       if (strncmp(srv->cli.dev,"IPC",3) && 
+           strcasecmp(share, "IPC$") &&
            strncmp(srv->cli.dev,"LPT",3) &&
            !smbw_getatr(srv, path, 
-                        &mode, NULL, NULL, NULL, NULL)) {
+                        &mode, NULL, NULL, NULL, NULL, NULL)) {
                errno = smbw_errno(&srv->cli);
                goto failed;
        }
@@ -415,9 +435,6 @@ int smbw_chdir(const char *name)
        DEBUG(4,("set SMBW_CWD to %s\n", cwd));
 
        pstrcpy(smbw_cwd, cwd);
-       if (setenv(SMBW_PWD_ENV, smbw_cwd, 1)) {
-               DEBUG(4,("setenv failed\n"));
-       }
 
        smbw_busy--;
        return 0;
@@ -554,7 +571,7 @@ char *smbw_getcwd(char *buf, size_t size)
        smbw_init();
 
        if (smbw_busy) {
-               return real_getcwd(buf, size);
+               return (char *)real_getcwd(buf, size);
        }
 
        smbw_busy++;
@@ -587,19 +604,23 @@ a wrapper for fchdir()
 int smbw_fchdir(unsigned int fd)
 {
        struct smbw_dir *dir;
+       int ret;
 
        smbw_busy++;
 
        dir = smbw_dir(fd);
-       if (!dir) {
-               errno = EBADF;
+       if (dir) {
                smbw_busy--;
-               return -1;
+               return chdir(dir->path);
        }       
 
+       ret = real_fchdir(fd);
+       if (ret == 0) {
+               sys_getwd(smbw_cwd);            
+       }
+
        smbw_busy--;
-       
-       return chdir(dir->path);
+       return ret;
 }
 
 /***************************************************** 
@@ -666,4 +687,3 @@ off_t smbw_telldir(DIR *dirp)
        struct smbw_dir *d = (struct smbw_dir *)dirp;
        return smbw_dir_lseek(d->fd,0,SEEK_CUR);
 }
-