From 0eca33bbf620678759bbe39efaa74f33f96efb74 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 11:57:02 +1000 Subject: s3-smb Use FILE_ATTRIBUTE_DIRECTORY intead of aDIR This means we use just one constant for this file attribute. Andrew Bartlett --- source3/client/client.c | 28 ++++++++++++++-------------- source3/client/clitar.c | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source3/client') diff --git a/source3/client/client.c b/source3/client/client.c index fed5b70bb1..dadaf44394 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -505,7 +505,7 @@ static bool do_this_one(struct file_info *finfo) return false; } - if (finfo->mode & aDIR) { + if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { return true; } @@ -752,7 +752,7 @@ static NTSTATUS do_list_helper(const char *mntpoint, struct file_info *f, *dir_end = '\0'; } - if (f->mode & aDIR) { + if (f->mode & FILE_ATTRIBUTE_DIRECTORY) { if (do_list_dirs && do_this_one(f)) { status = do_list_fn(cli_state, f, dir); if (!NT_STATUS_IS_OK(status)) { @@ -924,7 +924,7 @@ NTSTATUS do_list(const char *mask, static int cmd_dir(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mask = NULL; char *buf = NULL; int rc = 1; @@ -974,7 +974,7 @@ static int cmd_dir(void) static int cmd_du(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mask = NULL; char *buf = NULL; NTSTATUS status; @@ -1233,7 +1233,7 @@ static NTSTATUS do_mget(struct cli_state *cli_state, struct file_info *finfo, return NT_STATUS_UNSUCCESSFUL; } - if (finfo->mode & aDIR) { + if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { if (asprintf(&quest, "Get directory %s? ",finfo->name) < 0) { return NT_STATUS_NO_MEMORY; @@ -1251,7 +1251,7 @@ static NTSTATUS do_mget(struct cli_state *cli_state, struct file_info *finfo, } SAFE_FREE(quest); - if (!(finfo->mode & aDIR)) { + if (!(finfo->mode & FILE_ATTRIBUTE_DIRECTORY)) { rname = talloc_asprintf(ctx, "%s%s", client_get_cur_dir(), @@ -1306,7 +1306,7 @@ static NTSTATUS do_mget(struct cli_state *cli_state, struct file_info *finfo, return NT_STATUS_NO_MEMORY; } - status = do_list(mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR,do_mget,false, true); + status = do_list(mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,do_mget,false, true); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -1401,7 +1401,7 @@ static int cmd_mget(void) NTSTATUS status = NT_STATUS_OK; if (recurse) { - attribute |= aDIR; + attribute |= FILE_ATTRIBUTE_DIRECTORY; } abort_mget = false; @@ -2306,7 +2306,7 @@ static NTSTATUS do_del(struct cli_state *cli_state, struct file_info *finfo, return NT_STATUS_NO_MEMORY; } - if (finfo->mode & aDIR) { + if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { TALLOC_FREE(mask); return NT_STATUS_OK; } @@ -2333,7 +2333,7 @@ static int cmd_del(void) uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; if (recurse) { - attribute |= aDIR; + attribute |= FILE_ATTRIBUTE_DIRECTORY; } mask = talloc_strdup(ctx, client_get_cur_dir()); @@ -4516,7 +4516,7 @@ static NTSTATUS completion_remote_filter(const char *mnt, return NT_STATUS_OK; } - if ((info->dirmask[0] == 0) && !(f->mode & aDIR)) + if ((info->dirmask[0] == 0) && !(f->mode & FILE_ATTRIBUTE_DIRECTORY)) info->matches[info->count] = SMB_STRDUP(f->name); else { TALLOC_CTX *ctx = talloc_stackframe(); @@ -4532,7 +4532,7 @@ static NTSTATUS completion_remote_filter(const char *mnt, TALLOC_FREE(ctx); return NT_STATUS_NO_MEMORY; } - if (f->mode & aDIR) { + if (f->mode & FILE_ATTRIBUTE_DIRECTORY) { tmp = talloc_asprintf_append(tmp, "%s", CLI_DIRSEP_STR); } @@ -4546,7 +4546,7 @@ static NTSTATUS completion_remote_filter(const char *mnt, if (info->matches[info->count] == NULL) { return NT_STATUS_OK; } - if (f->mode & aDIR) { + if (f->mode & FILE_ATTRIBUTE_DIRECTORY) { smb_readline_ca_char(0); } if (info->count == 1) { @@ -4629,7 +4629,7 @@ static char **remote_completion(const char *text, int len) if (!cli_resolve_path(ctx, "", auth_info, cli, dirmask, &targetcli, &targetpath)) { goto cleanup; } - status = cli_list(targetcli, targetpath, aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, + status = cli_list(targetcli, targetpath, FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, completion_remote_filter, (void *)&info); if (!NT_STATUS_IS_OK(status)) { goto cleanup; diff --git a/source3/client/clitar.c b/source3/client/clitar.c index c389cfa776..ebda5af5e3 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -70,7 +70,7 @@ extern struct cli_state *cli; #define ATTRSET 1 #define ATTRRESET 0 -static uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; +static uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; #ifndef CLIENT_TIMEOUT #define CLIENT_TIMEOUT (30*1000) @@ -294,7 +294,7 @@ of link other than a GNUtar Longlink - ignoring\n")); if ((unoct(hb->dbuf.mode, sizeof(hb->dbuf.mode)) & S_IFDIR) || (*(finfo->name+strlen(finfo->name)-1) == '\\')) { - finfo->mode=aDIR; + finfo->mode=FILE_ATTRIBUTE_DIRECTORY; } else { finfo->mode=0; /* we don't care about mode at the moment, we'll * just make it a regular file */ @@ -852,7 +852,7 @@ static NTSTATUS do_tar(struct cli_state *cli_state, struct file_info *finfo, TALLOC_FREE(exclaim); } - if (finfo->mode & aDIR) { + if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { char *saved_curdir = NULL; char *new_cd = NULL; char *mtar_mask = NULL; -- cgit