summaryrefslogtreecommitdiffstats
path: root/bin/mv/mv.c
diff options
context:
space:
mode:
Diffstat (limited to 'bin/mv/mv.c')
-rw-r--r--bin/mv/mv.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 1d05ad9..f9de076 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mv.c,v 1.5 1996/02/19 00:44:19 wosch Exp $
+ * $Id: mv.c,v 1.6 1996/02/19 05:51:13 pst Exp $
*/
#ifndef lint
@@ -83,9 +83,11 @@ main(argc, argv)
switch (ch) {
case 'i':
iflg = 1;
+ fflg = 0;
break;
case 'f':
fflg = 1;
+ iflg = 0;
break;
default:
usage();
@@ -149,6 +151,13 @@ do_move(from, to)
* make sure the user wants to clobber it.
*/
if (!fflg && !access(to, F_OK)) {
+
+ /* prompt only if source exist */
+ if (lstat(from, &sb) == -1) {
+ warn("%s", from);
+ return (1);
+ }
+
ask = 0;
if (iflg) {
(void)fprintf(stderr, "overwrite %s? ", to);
@@ -164,7 +173,7 @@ do_move(from, to)
if (ask) {
if ((ch = getchar()) != EOF && ch != '\n')
while (getchar() != '\n');
- if (ch != 'y')
+ if (ch != 'y' && ch != 'Y')
return (0);
}
}
@@ -299,7 +308,9 @@ copy(from, to)
void
usage()
{
- (void)fprintf(stderr,
-"usage: mv [-if] src target;\n or: mv [-if] src1 ... srcN directory\n");
+ (void)fprintf(stderr,
+"\
+usage: mv [-i | -f] src target;\n\
+ or: mv [-i | -f] src1 ... srcN directory\n");
exit(1);
}
OpenPOWER on IntegriCloud