*/
#include "includes.h"
-#include "smbw.h"
#include "wrapper.h"
-static pstring smb_cwd;
-
-struct smbw_server {
- struct smbw_server *next, *prev;
- struct cli_state cli;
- char *server_name;
- char *share_name;
- dev_t dev;
-};
-
-struct smbw_file {
- struct smbw_file *next, *prev;
- int cli_fd, fd;
- char *fname;
- off_t offset;
- struct smbw_server *srv;
-};
-
-struct smbw_dir {
- struct smbw_dir *next, *prev;
- int fd;
- int offset, count, malloced;
- struct smbw_server *srv;
- struct file_info *list;
-};
+pstring smb_cwd;
static struct smbw_file *smbw_files;
-static struct smbw_dir *smbw_dirs;
static struct smbw_server *smbw_srvs;
-static struct bitmap *file_bmap;
-static pstring local_machine;
+struct bitmap *smbw_file_bmap;
+extern pstring global_myname;
extern int DEBUGLEVEL;
-static int smbw_busy;
+int smbw_busy=0;
/*****************************************************
initialise structures
dbf = fopen(p, "a");
}
- file_bmap = bitmap_allocate(SMBW_MAX_OPEN);
- if (!file_bmap) {
+ smbw_file_bmap = bitmap_allocate(SMBW_MAX_OPEN);
+ if (!smbw_file_bmap) {
exit(1);
}
in_client = True;
+ load_interfaces();
+
if (!lp_load(servicesf,True,False,False)) {
exit(1);
}
- get_myname(local_machine,NULL);
+ get_myname(global_myname,NULL);
if ((p=getenv("SMBW_DEBUG"))) {
DEBUGLEVEL = atoi(p);
DEBUG(4,("Initial cwd from getwd is %s\n", smb_cwd));
}
smbw_busy--;
+
+ set_maxfiles();
}
/*****************************************************
determine if a file descriptor is a smb one
*******************************************************/
-BOOL smbw_fd(int fd)
+int smbw_fd(int fd)
{
- if (smbw_busy) return False;
- return (fd >= SMBW_FD_OFFSET);
+ if (smbw_busy) return 0;
+ return smbw_file_bmap && bitmap_query(smbw_file_bmap, fd);
}
/*****************************************************
{
static pstring s;
char *p, *p2;
- int len;
+ int len = strlen(SMBW_PREFIX)-1;
*server = *share = *path = 0;
DEBUG(5,("cleaned %s (fname=%s cwd=%s)\n",
s, fname, smb_cwd));
- if (strncmp(s,SMBW_PREFIX,strlen(SMBW_PREFIX))) return s;
+ if (strncmp(s,SMBW_PREFIX,len) ||
+ (s[len] != '/' && s[len] != 0)) return s;
+
+ p = s + len;
+ if (*p == '/') p++;
- p = s + strlen(SMBW_PREFIX);
p2 = strchr(p,'/');
if (p2) {
p = p2;
if (!p) {
+ if (len == 0) {
+ char *workgroup = getenv("SMBW_WORKGROUP");
+ if (!workgroup) workgroup = lp_workgroup();
+ slprintf(server,sizeof(fstring)-1, "%s#1D", workgroup);
+ }
fstrcpy(share,"IPC$");
pstrcpy(path,"");
goto ok;
determine if a path name (possibly relative) is in the
smb name space
*******************************************************/
-BOOL smbw_path(const char *path)
+int smbw_path(const char *path)
{
fstring server, share;
pstring s;
int l=strlen(SMBW_PREFIX)-1;
if (path[0] == '/' && strncmp(path,SMBW_PREFIX,l)) {
- return False;
+ return 0;
}
- if (smbw_busy) return False;
+ if (smbw_busy) return 0;
smbw_init();
if (strncmp(cwd,SMBW_PREFIX,l) == 0 &&
(cwd[l] == '/' || cwd[l] == 0)) {
- return True;
+ return 1;
}
- return False;
+ return 0;
}
/*****************************************************
ret = cli_error(c, &eclass, &ecode);
if (ret) {
- DEBUG(3,("smbw_error %d %d (0x%x)\n",
- (int)eclass, (int)ecode, (int)ecode));
+ DEBUG(3,("smbw_error %d %d (0x%x) -> %d\n",
+ (int)eclass, (int)ecode, (int)ecode, ret));
}
return ret;
}
struct smbw_server *smbw_server(char *server, char *share)
{
struct smbw_server *srv=NULL;
- static struct cli_state c;
+ struct cli_state c;
char *username;
char *password;
char *workgroup;
struct nmb_name called, calling;
+ char *p, *server_n = server;
+ fstring group;
+
+ ZERO_STRUCT(c);
username = getenv("SMBW_USER");
if (!username) username = getenv("USER");
return NULL;
}
+ make_nmb_name(&calling, global_myname, 0x0, "");
+ make_nmb_name(&called , server, 0x20, "");
+
+ DEBUG(5,("server_n=[%s] server=[%s]\n", server_n, server));
+
+ if ((p=strchr(server_n,'#')) && strcmp(p+1,"1D")==0) {
+ struct in_addr ip;
+ fstrcpy(group, server_n);
+ p = strchr(group,'#');
+ *p = 0;
+ if (!find_master(group, &ip)) {
+ errno = ENOENT;
+ return NULL;
+ }
+ fstrcpy(group, inet_ntoa(ip));
+ server_n = group;
+ }
+
+ DEBUG(5,(" -> server_n=[%s] server=[%s]\n", server_n, server));
+
+ again:
/* have to open a new connection */
- if (!cli_initialise(&c) || !cli_connect(&c, server, NULL)) {
+ if (!cli_initialise(&c) || !cli_connect(&c, server_n, NULL)) {
errno = ENOENT;
return NULL;
}
- make_nmb_name(&calling, local_machine, 0x0, "");
- make_nmb_name(&called , server, 0x20, "");
-
if (!cli_session_request(&c, &calling, &called)) {
cli_shutdown(&c);
+ if (strcmp(called.name, "*SMBSERVER")) {
+ make_nmb_name(&called , "*SMBSERVER", 0x20, "");
+ goto again;
+ }
errno = ENOENT;
return NULL;
}
+
if (!cli_negprot(&c)) {
cli_shutdown(&c);
errno = ENOENT;
return NULL;
}
- if (!cli_send_tconX(&c, share,
- strstr(share,"IPC$")?"IPC":"A:",
+ if (!cli_send_tconX(&c, share, "?????",
password, strlen(password)+1)) {
errno = smbw_errno(&c);
cli_shutdown(&c);
return NULL;
}
-/*****************************************************
-map a fd to a smbw_dir structure
-*******************************************************/
-struct smbw_dir *smbw_dir(int fd)
-{
- struct smbw_dir *dir;
-
- for (dir=smbw_dirs;dir;dir=dir->next) {
- if (dir->fd == fd) return dir;
- }
- return NULL;
-}
-
-/*****************************************************
-setup basic info in a stat structure
-*******************************************************/
-void smbw_setup_stat(struct stat *st, char *fname, size_t size, int mode)
-{
- ZERO_STRUCTP(st);
-
- if (IS_DOS_DIR(mode)) {
- st->st_mode = SMBW_DIR_MODE;
- } else {
- st->st_mode = SMBW_FILE_MODE;
- }
-
- st->st_size = size;
- st->st_blksize = 512;
- st->st_blocks = (size+511)/512;
- st->st_uid = getuid();
- st->st_gid = getgid();
- st->st_ino = smbw_inode(fname);
-}
-
-
-/*****************************************************
-try to do a QPATHINFO and if that fails then do a getatr
-this is needed because win95 sometimes refuses the qpathinfo
-*******************************************************/
-static 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)
-{
- if (cli_qpathinfo(&srv->cli, path, c_time, a_time, m_time,
- 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;
- return True;
- }
- return False;
-}
-
-/*****************************************************
-free a smbw_dir structure and all entries
-*******************************************************/
-static void free_dir(struct smbw_dir *dir)
-{
- if (dir->list) {
- free(dir->list);
- }
- ZERO_STRUCTP(dir);
- free(dir);
-}
-
-
-static struct smbw_dir *cur_dir;
-
-/*****************************************************
-add a entry to a directory listing
-*******************************************************/
-void smbw_dir_add(struct file_info *finfo)
-{
- DEBUG(5,("%s\n", finfo->name));
-
- if (cur_dir->malloced == cur_dir->count) {
- cur_dir->list = (struct file_info *)Realloc(cur_dir->list,
- sizeof(cur_dir->list[0])*
- (cur_dir->count+100));
- if (!cur_dir->list) {
- /* oops */
- return;
- }
- cur_dir->malloced += 100;
- }
-
- cur_dir->list[cur_dir->count] = *finfo;
- cur_dir->count++;
-}
-
-/*****************************************************
-add a entry to a directory listing
-*******************************************************/
-void smbw_share_add(const char *share, uint32 type, const char *comment)
-{
- struct file_info finfo;
-
- ZERO_STRUCT(finfo);
-
- pstrcpy(finfo.name, share);
- finfo.mode = aRONLY | aDIR;
-
- smbw_dir_add(&finfo);
-}
-
-
-/*****************************************************
-open a directory on the server
-*******************************************************/
-int smbw_dir_open(const char *fname, int flags)
-{
- fstring server, share;
- pstring path;
- struct smbw_server *srv=NULL;
- struct smbw_dir *dir=NULL;
- pstring mask;
- int fd;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- if (!fname) {
- errno = EINVAL;
- return -1;
- }
-
- smbw_init();
-
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
-
- DEBUG(4,("dir_open share=%s\n", share));
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
- goto failed;
- }
-
- dir = (struct smbw_dir *)malloc(sizeof(*dir));
- if (!dir) {
- errno = ENOMEM;
- goto failed;
- }
-
- ZERO_STRUCTP(dir);
-
- cur_dir = dir;
-
- slprintf(mask, sizeof(mask)-1, "%s\\*", path);
- string_sub(mask,"\\\\","\\");
-
- if (strcmp(share,"IPC$") == 0) {
- DEBUG(4,("doing NetShareEnum\n"));
- if (cli_RNetShareEnum(&srv->cli, smbw_share_add) <= 0) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
- } else {
- if (cli_list(&srv->cli, mask, aHIDDEN|aSYSTEM|aDIR,
- smbw_dir_add) <= 0) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
- }
-
- cur_dir = NULL;
-
- fd = bitmap_find(file_bmap, 0);
- if (fd == -1) {
- errno = EMFILE;
- goto failed;
- }
-
- DLIST_ADD(smbw_dirs, dir);
-
- bitmap_set(file_bmap, fd);
-
- dir->fd = fd + SMBW_FD_OFFSET;
- dir->srv = srv;
-
- DEBUG(4,(" -> %d\n", dir->count));
-
- return dir->fd;
-
- failed:
- if (dir) {
- free_dir(dir);
- }
-
- return -1;
-}
-
-
/*****************************************************
a wrapper for open()
*******************************************************/
}
if (fd == -1) {
/* it might be a directory. Maybe we should use chkpath? */
- fd = smbw_dir_open(fname, flags);
+ fd = smbw_dir_open(fname);
smbw_busy--;
return fd;
}
ZERO_STRUCTP(file);
- file->cli_fd = fd;
- file->fname = strdup(path);
- if (!file->fname) {
+ file->f = (struct smbw_filedes *)malloc(sizeof(*(file->f)));
+ if (!file->f) {
errno = ENOMEM;
goto failed;
}
- file->srv = srv;
- file->fd = bitmap_find(file_bmap, 0);
+ ZERO_STRUCTP(file->f);
+
+ file->f->cli_fd = fd;
+ file->f->fname = strdup(path);
+ if (!file->f->fname) {
+ errno = ENOMEM;
+ goto failed;
+ }
+ file->srv = srv;
+ file->fd = open(SMBW_DUMMY, O_WRONLY);
if (file->fd == -1) {
errno = EMFILE;
goto failed;
}
- bitmap_set(file_bmap, file->fd);
+ if (bitmap_query(smbw_file_bmap, file->fd)) {
+ DEBUG(0,("ERROR: fd used in smbw_open\n"));
+ errno = EIO;
+ goto failed;
+ }
- file->fd += SMBW_FD_OFFSET;
+ file->f->ref_count=1;
+
+ bitmap_set(smbw_file_bmap, file->fd);
DLIST_ADD(smbw_files, file);
cli_close(&srv->cli, fd);
}
if (file) {
- if (file->fname) {
- free(file->fname);
+ if (file->f) {
+ if (file->f->fname) {
+ free(file->f->fname);
+ }
+ free(file->f);
}
free(file);
}
}
-/*****************************************************
-a wrapper for fstat() on a directory
-*******************************************************/
-int smbw_dir_fstat(int fd, struct stat *st)
-{
- struct smbw_dir *dir;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- dir = smbw_dir(fd);
- if (!dir) {
- errno = EBADF;
- return -1;
- }
-
- ZERO_STRUCTP(st);
-
- smbw_setup_stat(st, "", dir->count*sizeof(struct dirent), aDIR);
-
- st->st_dev = dir->srv->dev;
-
- return 0;
-}
-
-/*****************************************************
-a wrapper for fstat()
-*******************************************************/
-int smbw_fstat(int fd, struct stat *st)
-{
- struct smbw_file *file;
- time_t c_time, a_time, m_time;
- uint32 size;
- int mode;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- smbw_busy++;
-
- file = smbw_file(fd);
- if (!file) {
- int ret = smbw_dir_fstat(fd, st);
- smbw_busy--;
- return ret;
- }
-
- if (!cli_qfileinfo(&file->srv->cli, file->cli_fd,
- &mode, &size, &c_time, &a_time, &m_time) &&
- !cli_getattrE(&file->srv->cli, file->cli_fd,
- &mode, &size, &c_time, &a_time, &m_time)) {
- errno = EINVAL;
- smbw_busy--;
- return -1;
- }
-
- smbw_setup_stat(st, file->fname, size, mode);
-
- st->st_atime = a_time;
- st->st_ctime = c_time;
- st->st_mtime = m_time;
- st->st_dev = file->srv->dev;
-
- DEBUG(4,("%s - OK\n", __FUNCTION__));
-
- smbw_busy--;
- return 0;
-}
-
-
-/*****************************************************
-a wrapper for stat()
-*******************************************************/
-int smbw_stat(const char *fname, struct stat *st)
-{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
- time_t m_time=0, a_time=0, c_time=0;
- size_t size=0;
- uint32 mode=0;
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
-
- if (!fname) {
- errno = EINVAL;
- return -1;
- }
-
- smbw_init();
-
- smbw_busy++;
-
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
- goto failed;
- }
-
- if (strcmp(share,"IPC$") == 0) {
- mode = aDIR | aRONLY;
- } else {
- if (!smbw_getatr(srv, path,
- &mode, &size, &c_time, &a_time, &m_time)) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
- }
-
- smbw_setup_stat(st, path, size, mode);
-
- st->st_atime = time(NULL);
- st->st_ctime = m_time;
- st->st_mtime = m_time;
- st->st_dev = srv->dev;
-
- smbw_busy--;
- return 0;
-
- failed:
- smbw_busy--;
- return -1;
-}
-
/*****************************************************
a wrapper for read()
*******************************************************/
struct smbw_file *file;
int ret;
- DEBUG(4,("%s\n", __FUNCTION__));
+ DEBUG(4,("%s %d\n",
+ __FUNCTION__, (int)count));
smbw_busy++;
return -1;
}
- ret = cli_read(&file->srv->cli, file->cli_fd, buf, file->offset, count);
+ ret = cli_read(&file->srv->cli, file->f->cli_fd, buf, file->f->offset, count);
if (ret == -1) {
errno = smbw_errno(&file->srv->cli);
return -1;
}
- file->offset += ret;
+ file->f->offset += ret;
smbw_busy--;
return ret;
return -1;
}
- ret = cli_write(&file->srv->cli, file->cli_fd, buf, file->offset, count);
+ ret = cli_write(&file->srv->cli, file->f->cli_fd, buf, file->f->offset, count);
if (ret == -1) {
errno = smbw_errno(&file->srv->cli);
return -1;
}
- file->offset += ret;
+ file->f->offset += ret;
smbw_busy--;
return ret;
}
-/*****************************************************
-close a directory handle
-*******************************************************/
-int smbw_dir_close(int fd)
-{
- struct smbw_dir *dir;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- dir = smbw_dir(fd);
- if (!dir) {
- DEBUG(4,("%s(%d)\n", __FUNCTION__, __LINE__));
- errno = EBADF;
- return -1;
- }
-
- bitmap_clear(file_bmap, dir->fd - SMBW_FD_OFFSET);
-
- DLIST_REMOVE(smbw_dirs, dir);
-
- free_dir(dir);
-
- return 0;
-}
-
/*****************************************************
a wrapper for close()
*******************************************************/
return ret;
}
- if (!cli_close(&file->srv->cli, file->cli_fd)) {
+ if (file->f->ref_count == 1 &&
+ !cli_close(&file->srv->cli, file->f->cli_fd)) {
errno = smbw_errno(&file->srv->cli);
smbw_busy--;
return -1;
}
- bitmap_clear(file_bmap, file->fd - SMBW_FD_OFFSET);
+ bitmap_clear(smbw_file_bmap, file->fd);
+ close(file->fd);
DLIST_REMOVE(smbw_files, file);
- free(file->fname);
+ file->f->ref_count--;
+ if (file->f->ref_count == 0) {
+ free(file->f->fname);
+ free(file->f);
+ }
ZERO_STRUCTP(file);
free(file);
}
-/*****************************************************
-a wrapper for getdents()
-*******************************************************/
-int smbw_getdents(unsigned int fd, struct dirent *dirp, int count)
-{
- struct smbw_dir *dir;
- int n=0;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- smbw_busy++;
-
- dir = smbw_dir(fd);
- if (!dir) {
- errno = EBADF;
- smbw_busy--;
- return -1;
- }
-
- while (count>=sizeof(*dirp) && (dir->offset < dir->count)) {
- dirp->d_off = (dir->offset+1)*sizeof(*dirp);
- dirp->d_reclen = sizeof(*dirp);
- /* what's going on with the -1 here? maybe d_type
- isn't really there? */
- safe_strcpy(&dirp->d_name[-1], dir->list[dir->offset].name,
- sizeof(dirp->d_name)-1);
- dirp->d_ino = smbw_inode(dir->list[dir->offset].name);
- dir->offset++;
- count -= dirp->d_reclen;
- if (dir->offset == dir->count) {
- dirp->d_off = -1;
- }
- dirp++;
- n++;
- }
-
- smbw_busy--;
- return n*sizeof(*dirp);
-}
-
-
/*****************************************************
a wrapper for access()
*******************************************************/
}
-/*****************************************************
-a wrapper for chdir()
-*******************************************************/
-int smbw_chdir(const char *name)
-{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
- uint32 mode = aDIR;
- char *cwd;
-
- smbw_init();
-
- if (smbw_busy) return real_chdir(cwd);
-
- smbw_busy++;
-
- if (!name) {
- errno = EINVAL;
- goto failed;
- }
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, name));
-
- /* work out what server they are after */
- cwd = smbw_parse_path(name, server, share, path);
-
- if (strncmp(cwd,SMBW_PREFIX,strlen(SMBW_PREFIX))) {
- if (real_chdir(cwd) == 0) {
- DEBUG(4,("set SMBW_CWD to %s\n", cwd));
- pstrcpy(smb_cwd, cwd);
- if (setenv(SMBW_PWD_ENV, smb_cwd, 1)) {
- DEBUG(4,("setenv failed\n"));
- }
- goto success;
- }
- errno = ENOENT;
- goto failed;
- }
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
- goto failed;
- }
-
- if (strcmp(share,"IPC$") &&
- !smbw_getatr(srv, path,
- &mode, NULL, NULL, NULL, NULL)) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
-
- if (!(mode & aDIR)) {
- errno = ENOTDIR;
- goto failed;
- }
-
- DEBUG(4,("set SMBW_CWD2 to %s\n", cwd));
- pstrcpy(smb_cwd, cwd);
- if (setenv(SMBW_PWD_ENV, smb_cwd, 1)) {
- DEBUG(4,("setenv failed\n"));
- }
-
- /* we don't want the old directory to be busy */
- real_chdir("/");
-
- success:
- smbw_busy--;
- return 0;
-
- failed:
- smbw_busy--;
- return -1;
-}
-
-
/*****************************************************
a wrapper for unlink()
*******************************************************/
goto failed;
}
- if (!cli_unlink(&srv->cli, path)) {
+ if (strncmp(srv->cli.dev, "LPT", 3) == 0) {
+ int job = smbw_stat_printjob(srv, path, NULL, NULL);
+ if (job == -1) {
+ goto failed;
+ }
+ if (cli_printjob_del(&srv->cli, job) != 0) {
+ goto failed;
+ }
+ } else if (!cli_unlink(&srv->cli, path)) {
errno = smbw_errno(&srv->cli);
goto failed;
}
/*****************************************************
a wrapper for utime()
*******************************************************/
-int smbw_utime(const char *fname, struct utimbuf *buf)
+int smbw_utime(const char *fname, void *buf)
{
+ struct utimbuf *tbuf = (struct utimbuf *)buf;
struct smbw_server *srv;
fstring server, share;
pstring path;
goto failed;
}
- if (!cli_setatr(&srv->cli, path, mode, buf->modtime)) {
+ if (!cli_setatr(&srv->cli, path, mode, tbuf->modtime)) {
errno = smbw_errno(&srv->cli);
goto failed;
}
return -1;
}
-
-/*****************************************************
-a wrapper for lseek() on directories
-*******************************************************/
-off_t smbw_dir_lseek(int fd, off_t offset, int whence)
-{
- struct smbw_dir *dir;
- off_t ret;
-
- DEBUG(4,("%s offset=%d whence=%d\n", __FUNCTION__,
- (int)offset, whence));
-
- dir = smbw_dir(fd);
- if (!dir) {
- errno = EBADF;
- return -1;
- }
-
- switch (whence) {
- case SEEK_SET:
- dir->offset = offset/sizeof(struct dirent);
- break;
- case SEEK_CUR:
- dir->offset += offset/sizeof(struct dirent);
- break;
- case SEEK_END:
- dir->offset = (dir->count * sizeof(struct dirent)) + offset;
- dir->offset /= sizeof(struct dirent);
- break;
- }
-
- ret = dir->offset * sizeof(struct dirent);
-
- DEBUG(4,(" -> %d\n", (int)ret));
-
- return ret;
-}
-
/*****************************************************
a wrapper for lseek()
*******************************************************/
switch (whence) {
case SEEK_SET:
- file->offset = offset;
+ file->f->offset = offset;
break;
case SEEK_CUR:
- file->offset += offset;
+ file->f->offset += offset;
break;
case SEEK_END:
- if (!cli_qfileinfo(&file->srv->cli, file->cli_fd,
+ if (!cli_qfileinfo(&file->srv->cli, file->f->cli_fd,
NULL, &size, NULL, NULL, NULL) &&
- !cli_getattrE(&file->srv->cli, file->cli_fd,
+ !cli_getattrE(&file->srv->cli, file->f->cli_fd,
NULL, &size, NULL, NULL, NULL)) {
errno = EINVAL;
smbw_busy--;
return -1;
}
- file->offset = size + offset;
+ file->f->offset = size + offset;
break;
}
smbw_busy--;
- return file->offset;
+ return file->f->offset;
}
/*****************************************************
-a wrapper for mkdir()
+a wrapper for dup()
*******************************************************/
-int smbw_mkdir(const char *fname, mode_t mode)
+int smbw_dup(int fd)
{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
-
- if (!fname) {
- errno = EINVAL;
- return -1;
- }
+ int fd2;
+ struct smbw_file *file, *file2;
- smbw_init();
+ DEBUG(4,("%s\n", __FUNCTION__));
smbw_busy++;
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
+ file = smbw_file(fd);
+ if (!file) {
+ errno = EBADF;
+ goto failed;
+ }
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
+ fd2 = dup(file->fd);
+ if (fd2 == -1) {
goto failed;
}
- if (!cli_mkdir(&srv->cli, path)) {
- errno = smbw_errno(&srv->cli);
+ if (bitmap_query(smbw_file_bmap, fd2)) {
+ DEBUG(0,("ERROR: fd already open in dup!\n"));
+ errno = EIO;
goto failed;
}
+ file2 = (struct smbw_file *)malloc(sizeof(*file2));
+ if (!file2) {
+ close(fd2);
+ errno = ENOMEM;
+ goto failed;
+ }
+
+ ZERO_STRUCTP(file2);
+
+ *file2 = *file;
+ file2->fd = fd2;
+
+ file->f->ref_count++;
+
+ bitmap_set(smbw_file_bmap, fd2);
+
+ DLIST_ADD(smbw_files, file2);
+
smbw_busy--;
- return 0;
+ return fd2;
failed:
smbw_busy--;
return -1;
}
+
/*****************************************************
-a wrapper for rmdir()
+a wrapper for dup2()
*******************************************************/
-int smbw_rmdir(const char *fname)
+int smbw_dup2(int fd, int fd2)
{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
-
- if (!fname) {
- errno = EINVAL;
- return -1;
- }
+ struct smbw_file *file, *file2;
- smbw_init();
+ DEBUG(4,("%s\n", __FUNCTION__));
smbw_busy++;
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
+ file = smbw_file(fd);
+ if (!file) {
+ errno = EBADF;
goto failed;
}
- if (!cli_rmdir(&srv->cli, path)) {
- errno = smbw_errno(&srv->cli);
+ if (bitmap_query(smbw_file_bmap, fd2)) {
+ DEBUG(0,("ERROR: fd already open in dup2!\n"));
+ errno = EIO;
goto failed;
}
- smbw_busy--;
- return 0;
-
- failed:
- smbw_busy--;
- return -1;
-}
-
-
-/*****************************************************
-a wrapper for getcwd()
-*******************************************************/
-char *smbw_getcwd(char *buf, size_t size)
-{
- smbw_init();
+ if (dup2(file->fd, fd2) != fd2) {
+ goto failed;
+ }
- if (smbw_busy) {
- return __getcwd(buf, size);
+ file2 = (struct smbw_file *)malloc(sizeof(*file2));
+ if (!file2) {
+ close(fd2);
+ errno = ENOMEM;
+ goto failed;
}
- smbw_busy++;
+ ZERO_STRUCTP(file2);
- if (!buf) {
- if (size <= 0) size = strlen(smb_cwd)+1;
- buf = (char *)malloc(size);
- if (!buf) {
- errno = ENOMEM;
- smbw_busy--;
- return NULL;
- }
- }
+ *file2 = *file;
+ file2->fd = fd2;
- if (strlen(smb_cwd) > size-1) {
- errno = ERANGE;
- smbw_busy--;
- return NULL;
- }
+ file->f->ref_count++;
- safe_strcpy(buf, smb_cwd, size);
+ bitmap_set(smbw_file_bmap, fd2);
+
+ DLIST_ADD(smbw_files, file2);
+
+ smbw_busy--;
+ return fd2;
+ failed:
smbw_busy--;
- return buf;
+ return -1;
}
+