Plan 9 from Bell Labs’s /usr/web/sources/contrib/uriel/changes/2006/0107/3

Copyright © 2021 Plan 9 Foundation.
Distributed under the MIT License.
Download the Plan 9 distribution.


Fix error messages.
 [rsc] --rw-rw-r-- M 73506 rsc sys 3799 Jan  7 11:37 sys/src/cmd/fcp.c
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:44,50 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:44,50
	  	if(dirb!=nil && (dirb->mode&DMDIR))
	  		todir=1;
	  	if(argc>2 && !todir){
	- 		fprint(2, "cp: %s not a directory\n", argv[argc-1]);
	+ 		fprint(2, "fcp: %s not a directory\n", argv[argc-1]);
	  		exits("bad usage");
	  	}
	  	for(i=0; i<argc-1; i++)
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:73,79 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:73,79
	  	if(b->qid.vers==a->qid.vers)
	  	if(b->dev==a->dev)
	  	if(b->type==a->type){
	- 		fprint(2, "cp: %s and %s are the same file\n", an, bn);
	+ 		fprint(2, "fcp: %s and %s are the same file\n", an, bn);
	  		ret = 1;
	  	}
	  	free(b);
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:98,110 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:98,110
	  	}
	  
	  	if((dirb=dirstat(from))==nil){
	- 		fprint(2,"cp: can't stat %s: %r\n", from);
	+ 		fprint(2,"fcp: can't stat %s: %r\n", from);
	  		failed = 1;
	  		return;
	  	}
	  	mode = dirb->mode;
	  	if(mode&DMDIR){
	- 		fprint(2, "cp: %s is a directory\n", from);
	+ 		fprint(2, "fcp: %s is a directory\n", from);
	  		free(dirb);
	  		failed = 1;
	  		return;
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:117,123 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:117,123
	  	mode &= 0777;
	  	fdf=open(from, OREAD);
	  	if(fdf<0){
	- 		fprint(2, "cp: can't open %s: %r\n", from);
	+ 		fprint(2, "fcp: can't open %s: %r\n", from);
	  		free(dirb);
	  		failed = 1;
	  		return;
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:124,130 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:124,130
	  	}
	  	fdt=create(to, OWRITE, mode);
	  	if(fdt<0){
	- 		fprint(2, "cp: can't create %s: %r\n", to);
	+ 		fprint(2, "fcp: can't create %s: %r\n", to);
	  		close(fdf);
	  		free(dirb);
	  		failed = 1;
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:141,147 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:141,147
	  		if(gflag)
	  			dirt.gid = dirb->gid;
	  		if(dirfwstat(fdt, &dirt) < 0)
	- 			fprint(2, "cp: warning: can't wstat %s: %r\n", to);
	+ 			fprint(2, "fcp: warning: can't wstat %s: %r\n", to);
	  	}			
	  	free(dirb);
	  	close(fdf);
	/n/sourcesdump/2006/0107/plan9/sys/src/cmd/fcp.c:169,175 - 
	/n/sourcesdump/2006/0108/plan9/sys/src/cmd/fcp.c:169,175
	  		}
	  	}
	  	if(n == 0){
	- 		fprint(2, "cp: rfork: %r\n");
	+ 		fprint(2, "fcp: rfork: %r\n");
	  		failed = 1;
	  		return -1;
	  	}


Bell Labs OSI certified Powered by Plan 9

(Return to Plan 9 Home Page)

Copyright © 2021 Plan 9 Foundation. All Rights Reserved.
Comments to [email protected].