* fileopctx.h: Define new type mc_stat_fn.
* filegui.c (file_mask_dialog): Cast mc_stat and mc_lstat to mc_stat_fn to prevent warnings without VFS support. * fileopctx.c (file_op_context_new): Likewise.
Этот коммит содержится в:
родитель
f95559e1c3
Коммит
da462709f0
@ -1,3 +1,10 @@
|
||||
2001-10-01 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* fileopctx.h: Define new type mc_stat_fn.
|
||||
* filegui.c (file_mask_dialog): Cast mc_stat and mc_lstat to
|
||||
mc_stat_fn to prevent warnings without VFS support.
|
||||
* fileopctx.c (file_op_context_new): Likewise.
|
||||
|
||||
2001-09-23 Andrew V. Samoilov <kai@cmail.ru>
|
||||
|
||||
* find.c: Include rx.h or regex.h
|
||||
|
@ -924,9 +924,9 @@ ask_file_mask:
|
||||
return 0;
|
||||
|
||||
if (ctx->follow_links && operation != OP_MOVE)
|
||||
ctx->stat_func = mc_stat;
|
||||
ctx->stat_func = (mc_stat_fn) mc_stat;
|
||||
else
|
||||
ctx->stat_func = mc_lstat;
|
||||
ctx->stat_func = (mc_stat_fn) mc_lstat;
|
||||
|
||||
if (ctx->op_preserve || operation == OP_MOVE) {
|
||||
ctx->preserve = 1;
|
||||
|
@ -32,7 +32,7 @@ file_op_context_new (void)
|
||||
ctx->progress_bytes = 0.0;
|
||||
ctx->op_preserve = TRUE;
|
||||
ctx->do_reget = TRUE;
|
||||
ctx->stat_func = mc_lstat;
|
||||
ctx->stat_func = (mc_stat_fn) mc_lstat;
|
||||
ctx->preserve = TRUE;
|
||||
ctx->preserve_uidgid = (geteuid () == 0) ? TRUE : FALSE;
|
||||
ctx->umask_kill = 0777777;
|
||||
|
@ -14,6 +14,8 @@
|
||||
#include "eregex.h"
|
||||
|
||||
|
||||
typedef int (*mc_stat_fn) (char *filename, struct stat *buf);
|
||||
|
||||
/* This structure describes a context for file operations. It is used to update
|
||||
* the progress windows and pass around options.
|
||||
*/
|
||||
@ -54,7 +56,7 @@ typedef struct {
|
||||
int follow_links;
|
||||
|
||||
/* Pointer to the stat function we will use */
|
||||
int (*stat_func) (char *filename, struct stat *buf);
|
||||
mc_stat_fn stat_func;
|
||||
|
||||
/* Whether to recompute symlinks */
|
||||
int stable_symlinks;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user