=== modified file 'uspace/app/bdsh/cmds/modules/cp/cp.c' --- uspace/app/bdsh/cmds/modules/cp/cp.c 2011-10-29 17:02:30 +0000 +++ uspace/app/bdsh/cmds/modules/cp/cp.c 2012-04-05 14:11:19 +0000 @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -45,10 +47,12 @@ #define CP_DEFAULT_BUFLEN 1024 static const char *cmdname = "cp"; +static console_ctrl_t *con; static struct option const long_options[] = { { "buffer", required_argument, 0, 'b' }, { "force", no_argument, 0, 'f' }, + { "interactive", no_argument, 0, 'i'}, { "recursive", no_argument, 0, 'r' }, { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'v' }, @@ -64,6 +68,8 @@ static int64_t copy_file(const char *src, const char *dest, size_t blen, int vb); +static int64_t do_copy(const char *src, const char *dest, + size_t blen, int vb, int recursive, int force, int interactive); /** Get the type of a directory entry. * @@ -138,8 +144,129 @@ str_append(path1, path1_size, path2); } -static int64_t do_copy(const char *src, const char *dest, - size_t blen, int vb, int recursive, int force) +static bool get_user_decision(bool bdefault, const char *message, ...) +{ + va_list args; + kbd_event_t ev; + + va_start(args, message); + vprintf(message, args); + va_end(args); + + while(true) { + console_flush(con); + console_get_kbd_event(con, &ev); + if ((ev.type != KEY_PRESS) + || (ev.mods & (KM_CTRL | KM_ALT)) != 0) { + continue; + } + + switch(ev.key) { + case KC_Y: + printf("y\n"); + return true; + case KC_N: + printf("n\n"); + return false; + case KC_ENTER: + printf("n\n"); + return bdefault; + default: + break; + } + } +} + +static int64_t do_copy_file(const char *src, const char *dest, + size_t blen, int vb, int recursive, int force, int interactive) +{ + int r = 0; + char *src_fname; + char dest_path[PATH_MAX]; + char src_path[PATH_MAX]; + DIR *dir = NULL; + + dentry_type_t dest_type = get_type(dest); + + const size_t src_len = str_size(src); + + /* Initialize the src_path with the src argument */ + str_cpy(src_path, src_len + 1, src); + str_rtrim(src_path, '/'); + + /* Get the last component name from the src path */ + src_fname = get_last_path_component(src_path); + + /* Initialize dest_path with the dest argument */ + str_cpy(dest_path, PATH_MAX, dest); + + if (dest_type == TYPE_DIR) { + /* e.g. cp file_name /data */ + /* e.g. cp file_name /data/ */ + + /* dest is a directory, + * append the src filename to it. + */ + merge_paths(dest_path, PATH_MAX, src_fname); + dest_type = get_type(dest_path); + } else if (dest_type == TYPE_NONE) { + if (dest_path[str_size(dest_path) - 1] == '/') { + /* e.g. cp /textdemo /data/dirnotexists/ */ + + printf("The dest directory %s does not exists", + dest_path); + goto exit; + } + } + + if (dest_type == TYPE_DIR) { + printf("Cannot overwrite existing directory %s\n", + dest_path); + goto exit; + } else if (dest_type == TYPE_FILE) { + /* e.g. cp file_name existing_file */ + + /* dest already exists, + * if force is set we will try to remove it. + * if interactive is set user input is required. + */ + if (force && !interactive) { + if (unlink(dest_path)) { + printf("Unable to remove %s\n", + dest_path); + r = -1; + goto exit; + } + } else if (!force && interactive) { + if(get_user_decision(false, "File already exists: %s. Overwrite? [y/N]: ", + dest_path)) { + printf("Overwriting file: %s\n", dest_path); + if (unlink(dest_path)) { + printf("Unable to remove %s\n", dest_path); + r = -1; + goto exit; + } + } else { + printf("Not overwriting file: %s\n", dest_path); + goto exit; + } + } else { + printf("File already exists: %s\n", dest_path); + goto exit; + } + } + + /* call copy_file and exit */ + r = (copy_file(src, dest_path, blen, vb) < 0); + +exit: + if (dir) + closedir(dir); + return r; +} + +static int64_t do_copy_dir(const char *src, const char *dest, + size_t blen, int vb, int recursive, int force, int interactive) { int r = -1; char dest_path[PATH_MAX]; @@ -147,171 +274,128 @@ DIR *dir = NULL; struct dirent *dp; + dentry_type_t dest_type = get_type(dest); + + const size_t src_len = str_size(src); + + /* e.g. cp -r /x/srcdir /y/destdir/ */ + + if (!recursive) { + printf("Cannot copy the %s directory without the " + "-r option\n", src); + goto exit; + } else if (dest_type == TYPE_FILE) { + printf("Cannot overwrite a file with a directory\n"); + goto exit; + } + + char *src_dirname; + + /* Initialize src_path with the content of src */ + str_cpy(src_path, src_len + 1, src); + str_rtrim(src_path, '/'); + + src_dirname = get_last_path_component(src_path); + + str_cpy(dest_path, PATH_MAX, dest); + + switch (dest_type) { + case TYPE_DIR: + if (str_cmp(src_dirname, "..") && + str_cmp(src_dirname, ".")) { + /* The last component of src_path is + * not '.' or '..' + */ + merge_paths(dest_path, PATH_MAX, src_dirname); + + if (mkdir(dest_path, 0) == -1) { + printf("Unable to create " + "dest directory %s\n", dest_path); + goto exit; + } + } + break; + default: + case TYPE_NONE: + /* dest does not exists, this means the user wants + * to specify the name of the destination directory + * + * e.g. cp -r /src /data/new_dir_src + */ + if (mkdir(dest_path, 0)) { + printf("Unable to create " + "dest directory %s\n", dest_path); + r = -1; + goto exit; + } + break; + } + + dir = opendir(src); + if (!dir) { + /* Something strange is happening... */ + printf("Unable to open src %s directory\n", src); + goto exit; + } + + /* Copy every single directory entry of src into the + * destination directory. + */ + while ((dp = readdir(dir))) { + struct stat src_s; + struct stat dest_s; + + char src_dent[PATH_MAX]; + char dest_dent[PATH_MAX]; + + str_cpy(src_dent, PATH_MAX, src); + merge_paths(src_dent, PATH_MAX, dp->d_name); + + str_cpy(dest_dent, PATH_MAX, dest_path); + merge_paths(dest_dent, PATH_MAX, dp->d_name); + + /* Check if we are copying a directory into itself */ + stat(src_dent, &src_s); + stat(dest_path, &dest_s); + + if (dest_s.index == src_s.index && + dest_s.fs_handle == src_s.fs_handle) { + printf("Cannot copy a directory " + "into itself\n"); + goto exit; + } + + if (vb) + printf("copy %s %s\n", src_dent, dest_dent); + + /* Recursively call do_copy() */ + r = do_copy(src_dent, dest_dent, blen, vb, recursive, + force, interactive); + if (r) + goto exit; + + } + +exit: + if (dir) + closedir(dir); + return r; +} + +static int64_t do_copy(const char *src, const char *dest, + size_t blen, int vb, int recursive, int force, int interactive) +{ + int r = 0; + dentry_type_t src_type = get_type(src); - dentry_type_t dest_type = get_type(dest); - - const size_t src_len = str_size(src); if (src_type == TYPE_FILE) { - char *src_fname; - - /* Initialize the src_path with the src argument */ - str_cpy(src_path, src_len + 1, src); - str_rtrim(src_path, '/'); - - /* Get the last component name from the src path */ - src_fname = get_last_path_component(src_path); - - /* Initialize dest_path with the dest argument */ - str_cpy(dest_path, PATH_MAX, dest); - - if (dest_type == TYPE_DIR) { - /* e.g. cp file_name /data */ - /* e.g. cp file_name /data/ */ - - /* dest is a directory, - * append the src filename to it. - */ - merge_paths(dest_path, PATH_MAX, src_fname); - dest_type = get_type(dest_path); - } else if (dest_type == TYPE_NONE) { - if (dest_path[str_size(dest_path) - 1] == '/') { - /* e.g. cp /textdemo /data/dirnotexists/ */ - - printf("The dest directory %s does not exists", - dest_path); - goto exit; - } - } - - if (dest_type == TYPE_DIR) { - printf("Cannot overwrite existing directory %s\n", - dest_path); - goto exit; - } else if (dest_type == TYPE_FILE) { - /* e.g. cp file_name existing_file */ - - /* dest already exists, if force is set we will - * try to remove it. - */ - if (force) { - if (unlink(dest_path)) { - printf("Unable to remove %s\n", - dest_path); - goto exit; - } - } else { - printf("file already exists: %s\n", dest_path); - goto exit; - } - } - - /* call copy_file and exit */ - r = (copy_file(src, dest_path, blen, vb) < 0); - + r = do_copy_file(src, dest, blen, vb, recursive, force, interactive); } else if (src_type == TYPE_DIR) { - /* e.g. cp -r /x/srcdir /y/destdir/ */ - - if (!recursive) { - printf("Cannot copy the %s directory without the " - "-r option\n", src); - goto exit; - } else if (dest_type == TYPE_FILE) { - printf("Cannot overwrite a file with a directory\n"); - goto exit; - } - - char *src_dirname; - - /* Initialize src_path with the content of src */ - str_cpy(src_path, src_len + 1, src); - str_rtrim(src_path, '/'); - - src_dirname = get_last_path_component(src_path); - - str_cpy(dest_path, PATH_MAX, dest); - - switch (dest_type) { - case TYPE_DIR: - if (str_cmp(src_dirname, "..") && - str_cmp(src_dirname, ".")) { - /* The last component of src_path is - * not '.' or '..' - */ - merge_paths(dest_path, PATH_MAX, src_dirname); - - if (mkdir(dest_path, 0) == -1) { - printf("Unable to create " - "dest directory %s\n", dest_path); - goto exit; - } - } - break; - default: - case TYPE_NONE: - /* dest does not exists, this means the user wants - * to specify the name of the destination directory - * - * e.g. cp -r /src /data/new_dir_src - */ - if (mkdir(dest_path, 0)) { - printf("Unable to create " - "dest directory %s\n", dest_path); - goto exit; - } - break; - } - - dir = opendir(src); - if (!dir) { - /* Something strange is happening... */ - printf("Unable to open src %s directory\n", src); - goto exit; - } - - /* Copy every single directory entry of src into the - * destination directory. - */ - while ((dp = readdir(dir))) { - struct stat src_s; - struct stat dest_s; - - char src_dent[PATH_MAX]; - char dest_dent[PATH_MAX]; - - str_cpy(src_dent, PATH_MAX, src); - merge_paths(src_dent, PATH_MAX, dp->d_name); - - str_cpy(dest_dent, PATH_MAX, dest_path); - merge_paths(dest_dent, PATH_MAX, dp->d_name); - - /* Check if we are copying a directory into itself */ - stat(src_dent, &src_s); - stat(dest_path, &dest_s); - - if (dest_s.index == src_s.index && - dest_s.fs_handle == src_s.fs_handle) { - printf("Cannot copy a directory " - "into itself\n"); - goto exit; - } - - if (vb) - printf("copy %s %s\n", src_dent, dest_dent); - - /* Recursively call do_copy() */ - r = do_copy(src_dent, dest_dent, blen, vb, recursive, - force); - if (r) - goto exit; - - } + r = do_copy_dir(src, dest, blen, vb, recursive, force, interactive); } else printf("Unable to open source file %s\n", src); -exit: - if (dir) - closedir(dir); return r; } @@ -379,7 +463,8 @@ " -h, --help A short option summary\n" " -v, --version Print version information and exit\n" " -V, --verbose Be annoyingly noisy about what's being done\n" - " -f, --force Do not complain when exists\n" + " -f, --force Do not complain when exists (overrides a previous -i)\n" + " -i, --interactive Ask what to do when exists (overrides a previous -f)\n" " -r, --recursive Copy entire directories\n" " -b, --buffer ## Set the read buffer size to ##\n"; if (level == HELP_SHORT) { @@ -396,14 +481,15 @@ { unsigned int argc, verbose = 0; int buffer = 0, recursive = 0; - int force = 0; + int force = 0, interactive = 0; int c, opt_ind; int64_t ret; + con = console_init(stdin, stdout); argc = cli_count_args(argv); for (c = 0, optind = 0, opt_ind = 0; c != -1;) { - c = getopt_long(argc, argv, "hvVfrb:", long_options, &opt_ind); + c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind); switch (c) { case 'h': help_cmd_cp(1); @@ -415,8 +501,13 @@ verbose = 1; break; case 'f': + interactive = 0; force = 1; break; + case 'i': + force = 0; + interactive = 1; + break; case 'r': recursive = 1; break; @@ -425,6 +516,7 @@ printf("%s: Invalid buffer specification, " "(should be a number greater than zero)\n", cmdname); + console_done(con); return CMD_FAILURE; } if (verbose) @@ -441,11 +533,14 @@ if (argc != 2) { printf("%s: invalid number of arguments. Try %s --help\n", cmdname, cmdname); + console_done(con); return CMD_FAILURE; } ret = do_copy(argv[optind], argv[optind + 1], buffer, verbose, - recursive, force); + recursive, force, interactive); + + console_done(con); if (ret == 0) return CMD_SUCCESS;