|
@@ -1,17 +1,17 @@
|
|
|
#include <u.h>
|
|
|
#include <libc.h>
|
|
|
|
|
|
-void split(char *, char **, char **);
|
|
|
-int samefile(char *, char *);
|
|
|
-int mv(char *from, char *todir, char *toelem);
|
|
|
int copy1(int fdf, int fdt, char *from, char *to);
|
|
|
void hardremove(char *);
|
|
|
+int mv(char *from, char *todir, char *toelem);
|
|
|
+int mv1(char *from, Dir *dirb, char *todir, char *toelem);
|
|
|
+int samefile(char *, char *);
|
|
|
+void split(char *, char **, char **);
|
|
|
|
|
|
void
|
|
|
main(int argc, char *argv[])
|
|
|
{
|
|
|
- int i;
|
|
|
- int failed;
|
|
|
+ int i, failed;
|
|
|
Dir *dirto, *dirfrom;
|
|
|
char *todir, *toelem;
|
|
|
|
|
@@ -20,21 +20,30 @@ main(int argc, char *argv[])
|
|
|
fprint(2, " mv fromfile ... todir\n");
|
|
|
exits("bad usage");
|
|
|
}
|
|
|
+
|
|
|
+ /* prepass to canonicalise names before splitting, etc. */
|
|
|
+ for(i=1; i < argc; i++)
|
|
|
+ cleanname(argv[i]);
|
|
|
+
|
|
|
if((dirto = dirstat(argv[argc-1])) != nil && (dirto->mode&DMDIR)){
|
|
|
+ dirfrom = nil;
|
|
|
if(argc == 3
|
|
|
- && (dirfrom = dirstat(argv[1])) !=nil
|
|
|
- && (dirfrom->mode & DMDIR))
|
|
|
- split(argv[argc-1], &todir, &toelem);
|
|
|
- else{
|
|
|
+ && (dirfrom = dirstat(argv[1])) != nil
|
|
|
+ && (dirfrom->mode & DMDIR))
|
|
|
+ split(argv[argc-1], &todir, &toelem); /* mv dir1 dir2 */
|
|
|
+ else{ /* mv file... dir */
|
|
|
todir = argv[argc-1];
|
|
|
- toelem = 0; /* toelem will be fromelem */
|
|
|
+ toelem = nil; /* toelem will be fromelem */
|
|
|
}
|
|
|
+ free(dirfrom);
|
|
|
}else
|
|
|
- split(argv[argc-1], &todir, &toelem);
|
|
|
- if(argc>3 && toelem != 0){
|
|
|
+ split(argv[argc-1], &todir, &toelem); /* mv file1 file2 */
|
|
|
+ free(dirto);
|
|
|
+ if(argc>3 && toelem != nil){
|
|
|
fprint(2, "mv: %s not a directory\n", argv[argc-1]);
|
|
|
exits("bad usage");
|
|
|
}
|
|
|
+
|
|
|
failed = 0;
|
|
|
for(i=1; i < argc-1; i++)
|
|
|
if(mv(argv[i], todir, toelem) < 0)
|
|
@@ -47,17 +56,27 @@ main(int argc, char *argv[])
|
|
|
int
|
|
|
mv(char *from, char *todir, char *toelem)
|
|
|
{
|
|
|
- Dir *dirb, *dirt, null;
|
|
|
- char toname[4096], fromname[4096];
|
|
|
- int fdf, fdt, i, j;
|
|
|
int stat;
|
|
|
- char *fromdir, *fromelem;
|
|
|
+ Dir *dirb;
|
|
|
|
|
|
dirb = dirstat(from);
|
|
|
if(dirb == nil){
|
|
|
fprint(2, "mv: can't stat %s: %r\n", from);
|
|
|
return -1;
|
|
|
}
|
|
|
+ stat = mv1(from, dirb, todir, toelem);
|
|
|
+ free(dirb);
|
|
|
+ return stat;
|
|
|
+}
|
|
|
+
|
|
|
+int
|
|
|
+mv1(char *from, Dir *dirb, char *todir, char *toelem)
|
|
|
+{
|
|
|
+ int fdf, fdt, i, j, stat;
|
|
|
+ char toname[4096], fromname[4096];
|
|
|
+ char *fromdir, *fromelem;
|
|
|
+ Dir *dirt, null;
|
|
|
+
|
|
|
strncpy(fromname, from, sizeof fromname);
|
|
|
split(from, &fromdir, &fromelem);
|
|
|
if(toelem == 0)
|
|
@@ -69,29 +88,37 @@ mv(char *from, char *todir, char *toelem)
|
|
|
}
|
|
|
j = strlen(todir);
|
|
|
if(i + j + 2 > sizeof toname){
|
|
|
- fprint(2, "mv: path too big (max %d): %s/%s\n", sizeof toname, todir, toelem);
|
|
|
+ fprint(2, "mv: path too big (max %d): %s/%s\n",
|
|
|
+ sizeof toname, todir, toelem);
|
|
|
return -1;
|
|
|
}
|
|
|
memmove(toname, todir, j);
|
|
|
toname[j] = '/';
|
|
|
memmove(toname+j+1, toelem, i);
|
|
|
toname[i+j+1] = 0;
|
|
|
+
|
|
|
if(samefile(fromdir, todir)){
|
|
|
if(samefile(fromname, toname)){
|
|
|
- fprint(2, "mv: %s and %s are the same\n", fromname, toname);
|
|
|
+ fprint(2, "mv: %s and %s are the same\n",
|
|
|
+ fromname, toname);
|
|
|
return -1;
|
|
|
}
|
|
|
+
|
|
|
+ /* remove target if present */
|
|
|
dirt = dirstat(toname);
|
|
|
- if(dirt != nil){
|
|
|
- free(dirt);
|
|
|
+ if(dirt != nil) {
|
|
|
hardremove(toname);
|
|
|
+ free(dirt);
|
|
|
}
|
|
|
+
|
|
|
+ /* try wstat */
|
|
|
nulldir(&null);
|
|
|
null.name = toelem;
|
|
|
if(dirwstat(fromname, &null) >= 0)
|
|
|
return 0;
|
|
|
if(dirb->mode & DMDIR){
|
|
|
- fprint(2, "mv: can't rename directory %s: %r\n", fromname);
|
|
|
+ fprint(2, "mv: can't rename directory %s: %r\n",
|
|
|
+ fromname);
|
|
|
return -1;
|
|
|
}
|
|
|
}
|
|
@@ -99,7 +126,8 @@ mv(char *from, char *todir, char *toelem)
|
|
|
* Renaming won't work --- must copy
|
|
|
*/
|
|
|
if(dirb->mode & DMDIR){
|
|
|
- fprint(2, "mv: %s is a directory, not copied to %s\n", fromname, toname);
|
|
|
+ fprint(2, "mv: %s is a directory, not copied to %s\n",
|
|
|
+ fromname, toname);
|
|
|
return -1;
|
|
|
}
|
|
|
fdf = open(fromname, OREAD);
|
|
@@ -107,10 +135,12 @@ mv(char *from, char *todir, char *toelem)
|
|
|
fprint(2, "mv: can't open %s: %r\n", fromname);
|
|
|
return -1;
|
|
|
}
|
|
|
+
|
|
|
dirt = dirstat(toname);
|
|
|
if(dirt != nil && (dirt->mode & DMAPPEND))
|
|
|
- hardremove(toname); /* because create() won't truncate file */
|
|
|
+ hardremove(toname); /* because create() won't truncate file */
|
|
|
free(dirt);
|
|
|
+
|
|
|
fdt = create(toname, OWRITE, dirb->mode);
|
|
|
if(fdt < 0){
|
|
|
fprint(2, "mv: can't create %s: %r\n", toname);
|
|
@@ -119,6 +149,7 @@ mv(char *from, char *todir, char *toelem)
|
|
|
}
|
|
|
stat = copy1(fdf, fdt, fromname, toname);
|
|
|
close(fdf);
|
|
|
+
|
|
|
if(stat >= 0){
|
|
|
nulldir(&null);
|
|
|
null.mtime = dirb->mtime;
|
|
@@ -139,16 +170,11 @@ copy1(int fdf, int fdt, char *from, char *to)
|
|
|
char buf[8192];
|
|
|
long n, n1;
|
|
|
|
|
|
- for(;;){
|
|
|
- n = read(fdf, buf, sizeof buf);
|
|
|
- if(n >= 0){
|
|
|
- if(n == 0)
|
|
|
- break;
|
|
|
- n1 = write(fdt, buf, n);
|
|
|
- if(n1 != n){
|
|
|
- fprint(2, "mv: error writing %s: %r\n", to);
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ while ((n = read(fdf, buf, sizeof buf)) > 0) {
|
|
|
+ n1 = write(fdt, buf, n);
|
|
|
+ if(n1 != n){
|
|
|
+ fprint(2, "mv: error writing %s: %r\n", to);
|
|
|
+ return -1;
|
|
|
}
|
|
|
}
|
|
|
if(n < 0){
|
|
@@ -187,13 +213,12 @@ samefile(char *a, char *b)
|
|
|
return 1;
|
|
|
da = dirstat(a);
|
|
|
db = dirstat(b);
|
|
|
- ret = (da !=nil ) &&
|
|
|
- (db != nil) &&
|
|
|
- (da->qid.type==db->qid.type) &&
|
|
|
- (da->qid.path==db->qid.path) &&
|
|
|
- (da->qid.vers==db->qid.vers) &&
|
|
|
- (da->dev==db->dev) &&
|
|
|
- da->type==db->type;
|
|
|
+ ret = (da != nil && db != nil &&
|
|
|
+ da->qid.type==db->qid.type &&
|
|
|
+ da->qid.path==db->qid.path &&
|
|
|
+ da->qid.vers==db->qid.vers &&
|
|
|
+ da->dev==db->dev &&
|
|
|
+ da->type==db->type);
|
|
|
free(da);
|
|
|
free(db);
|
|
|
return ret;
|
|
@@ -206,5 +231,6 @@ hardremove(char *a)
|
|
|
fprint(2, "mv: can't remove %s: %r\n", a);
|
|
|
exits("mv");
|
|
|
}
|
|
|
- do; while(remove(a) != -1);
|
|
|
+ while(remove(a) != -1)
|
|
|
+ ;
|
|
|
}
|