summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-04-06 08:02:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:50:41 -0500
commit19680ba4df36400cc8834795434118960d5cafc4 (patch)
treea96381d47adc41dfb7317ac781fc423898ee6b98 /source4/ntvfs
parentf9235e0964d921cc1df7b4c4b7ab91a1c1ab4d54 (diff)
downloadsamba-19680ba4df36400cc8834795434118960d5cafc4.tar.gz
samba-19680ba4df36400cc8834795434118960d5cafc4.tar.bz2
samba-19680ba4df36400cc8834795434118960d5cafc4.zip
r65: added support for file streams in the simple NTVFS backend
(This used to be commit 9a9cc44a05510a69ad902db4d01dc12b6ac4f8ba)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/simple/svfs.h8
-rw-r--r--source4/ntvfs/simple/svfs_util.c26
-rw-r--r--source4/ntvfs/simple/vfs_simple.c84
3 files changed, 105 insertions, 13 deletions
diff --git a/source4/ntvfs/simple/svfs.h b/source4/ntvfs/simple/svfs.h
index e74fd07fce..6e44d290da 100644
--- a/source4/ntvfs/simple/svfs.h
+++ b/source4/ntvfs/simple/svfs.h
@@ -8,6 +8,8 @@ struct svfs_private {
/* next available search handle */
uint16 next_search_handle;
+
+ struct svfs_file *open_files;
};
struct svfs_dir {
@@ -19,6 +21,12 @@ struct svfs_dir {
} *files;
};
+struct svfs_file {
+ struct svfs_file *next, *prev;
+ int fd;
+ char *name;
+};
+
struct search_state {
struct search_state *next, *prev;
TALLOC_CTX *mem_ctx;
diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index baa6f86d94..598b85f1ad 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -52,9 +52,8 @@ char *svfs_unix_path(struct request_context *req, const char *name)
returned names are separate unix and DOS names. The returned names
are relative to the directory
*/
-struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, const char *pattern)
+struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct request_context *req, const char *unix_path)
{
- char *unix_path;
char *p, *mask;
struct svfs_dir *dir;
DIR *odir;
@@ -62,9 +61,6 @@ struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, con
uint_t allocated = 0;
char *low_mask;
- unix_path = svfs_unix_path(req, pattern);
- if (!unix_path) { return NULL; }
-
dir = talloc(mem_ctx, sizeof(struct svfs_dir));
if (!dir) { return NULL; }
@@ -93,6 +89,11 @@ struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, con
char *full_name;
char *low_name;
+ if (strchr(dent->d_name, ':') && !strchr(unix_path, ':')) {
+ /* don't show streams in dir listing */
+ continue;
+ }
+
low_name = talloc_strdup(mem_ctx, dent->d_name);
if (!low_name) { continue; }
strlower(low_name);
@@ -129,6 +130,21 @@ struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, con
return dir;
}
+/*
+ read a directory and find all matching file names and stat info
+ returned names are separate unix and DOS names. The returned names
+ are relative to the directory
+*/
+struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, const char *pattern)
+{
+ char *unix_path;
+
+ unix_path = svfs_unix_path(req, pattern);
+ if (!unix_path) { return NULL; }
+
+ return svfs_list_unix(mem_ctx, req, unix_path);
+}
+
/*******************************************************************
set the time on a file via file descriptor
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 157bf03320..6e51d8a638 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -74,6 +74,20 @@ static NTSTATUS svfs_disconnect(struct tcon_context *req)
}
/*
+ find open file handle given fd
+*/
+static struct svfs_file *find_fd(struct svfs_private *private, int fd)
+{
+ struct svfs_file *f;
+ for (f=private->open_files;f;f=f->next) {
+ if (f->fd == fd) {
+ return f;
+ }
+ }
+ return NULL;
+}
+
+/*
delete a file - the dirtype specifies the file types to include in the search.
The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
*/
@@ -124,8 +138,27 @@ static NTSTATUS svfs_chkpath(struct request_context *req, struct smb_chkpath *cp
/*
approximately map a struct stat to a generic fileinfo struct
*/
-static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinfo *info, struct stat *st)
+static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinfo *info,
+ struct stat *st, const char *unix_path)
{
+ struct svfs_dir *dir = NULL;
+ char *pattern = NULL;
+ int i;
+ char *s, *short_name;
+
+ s = strrchr(unix_path, '/');
+ if (s) {
+ short_name = s+1;
+ } else {
+ short_name = "";
+ }
+
+ asprintf(&pattern, "%s:*", unix_path);
+
+ if (pattern) {
+ dir = svfs_list_unix(req->mem_ctx, req, pattern);
+ }
+
unix_to_nt_time(&info->generic.out.create_time, st->st_ctime);
unix_to_nt_time(&info->generic.out.access_time, st->st_atime);
unix_to_nt_time(&info->generic.out.write_time, st->st_mtime);
@@ -141,8 +174,8 @@ static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinf
info->generic.out.delete_pending = 0;
info->generic.out.ea_size = 0;
info->generic.out.num_eas = 0;
- info->generic.out.fname.s = talloc_strdup(req->mem_ctx, "TODO - STORE FILENAME");
- info->generic.out.alt_fname.s = talloc_strdup(req->mem_ctx, "TODO - STORE ALT_FN");
+ info->generic.out.fname.s = talloc_strdup(req->mem_ctx, short_name);
+ info->generic.out.alt_fname.s = talloc_strdup(req->mem_ctx, short_name);
info->generic.out.ex_attrib = 0;
info->generic.out.compressed_size = 0;
info->generic.out.format = 0;
@@ -157,15 +190,23 @@ static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinf
info->generic.out.reparse_tag = 0;
info->generic.out.num_streams = 0;
/* setup a single data stream */
- info->generic.out.num_streams = 1;
- info->generic.out.streams = talloc(req->mem_ctx, sizeof(info->stream_info.out.streams[0]));
+ info->generic.out.num_streams = 1 + (dir?dir->count:0);
+ info->generic.out.streams = talloc_array_p(req->mem_ctx,
+ struct stream_struct,
+ info->generic.out.num_streams);
if (!info->generic.out.streams) {
return NT_STATUS_NO_MEMORY;
}
info->generic.out.streams[0].size = st->st_size;
info->generic.out.streams[0].alloc_size = st->st_size;
info->generic.out.streams[0].stream_name.s = talloc_strdup(req->mem_ctx,"::$DATA");
- /* REWRITE: end */
+
+ for (i=0;dir && i<dir->count;i++) {
+ s = strchr(dir->files[i].name, ':');
+ info->generic.out.streams[1+i].size = dir->files[i].st.st_size;
+ info->generic.out.streams[1+i].alloc_size = dir->files[i].st.st_size;
+ info->generic.out.streams[1+i].stream_name.s = s?s:dir->files[i].name;
+ }
return NT_STATUS_OK;
}
@@ -192,7 +233,7 @@ static NTSTATUS svfs_qpathinfo(struct request_context *req, union smb_fileinfo *
return map_nt_error_from_unix(errno);
}
DEBUG(19,("svfs_qpathinfo: file %s, stat done\n", unix_path));
- return svfs_map_fileinfo(req, info, &st);
+ return svfs_map_fileinfo(req, info, &st, unix_path);
}
/*
@@ -200,11 +241,18 @@ static NTSTATUS svfs_qpathinfo(struct request_context *req, union smb_fileinfo *
*/
static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *info)
{
+ struct svfs_private *private = req->conn->ntvfs_private;
+ struct svfs_file *f;
struct stat st;
if (info->generic.level != RAW_FILEINFO_GENERIC) {
return ntvfs_map_qfileinfo(req, info);
}
+
+ f = find_fd(private, info->generic.in.fnum);
+ if (!f) {
+ return NT_STATUS_INVALID_HANDLE;
+ }
if (fstat(info->generic.in.fnum, &st) == -1) {
if (errno == 0)
@@ -212,7 +260,7 @@ static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *
return map_nt_error_from_unix(errno);
}
- return svfs_map_fileinfo(req, info, &st);
+ return svfs_map_fileinfo(req, info, &st, f->name);
}
@@ -221,9 +269,11 @@ static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *
*/
static NTSTATUS svfs_open(struct request_context *req, union smb_open *io)
{
+ struct svfs_private *private = req->conn->ntvfs_private;
char *unix_path;
struct stat st;
int fd, flags;
+ struct svfs_file *f;
if (io->generic.level != RAW_OPEN_GENERIC) {
return ntvfs_map_open(req, io);
@@ -289,6 +339,12 @@ static NTSTATUS svfs_open(struct request_context *req, union smb_open *io)
return map_nt_error_from_unix(errno);
}
+ f = talloc_p(req->conn->mem_ctx, struct svfs_file);
+ f->fd = fd;
+ f->name = talloc_strdup(req->conn->mem_ctx, unix_path);
+
+ DLIST_ADD(private->open_files, f);
+
ZERO_STRUCT(io->generic.out);
unix_to_nt_time(&io->generic.out.create_time, st.st_ctime);
@@ -461,15 +517,27 @@ static NTSTATUS svfs_flush(struct request_context *req, struct smb_flush *io)
*/
static NTSTATUS svfs_close(struct request_context *req, union smb_close *io)
{
+ struct svfs_private *private = req->conn->ntvfs_private;
+ struct svfs_file *f;
+
if (io->generic.level != RAW_CLOSE_CLOSE) {
/* we need a mapping function */
return NT_STATUS_INVALID_LEVEL;
}
+ f = find_fd(private, io->close.in.fnum);
+ if (!f) {
+ return NT_STATUS_INVALID_HANDLE;
+ }
+
if (close(io->close.in.fnum) != 0) {
return map_nt_error_from_unix(errno);
}
+ DLIST_REMOVE(private->open_files, f);
+ talloc_free(req->conn->mem_ctx, f->name);
+ talloc_free(req->conn->mem_ctx, f);
+
return NT_STATUS_OK;
}