upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix style bugs and inconsistencies introduced in rev 1.16.

Browse source 
Submitted by:	bde
This commit is contained in:
Sheldon Hearn 2000-08-17 16:08:06 +00:00
parent ae36106661
commit 7e7574af89
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bin/ln/ln.c
View file

@ -92,17 +92,15 @@ main(argc, argv)
usage();
}
fflag = iflag = sflag = vflag = 0;
while ((ch = getopt(argc, argv, "fisv")) != -1)
switch (ch) {
case 'f':
fflag = 1;
iflag = 0; /* -f overrides iflag */
iflag = 0;
break;
case 'i':
iflag = 1;
fflag = 0; /* -i overrides fflag */
fflag = 0;
break;
case 's':
sflag = 1;
@ -146,7 +144,7 @@ linkit(target, source, isdir)
int isdir;
{
struct stat sb;
int exists, ch, first;
int ch, exists, first;
char *p, path[MAXPATHLEN];
if (!sflag) {
@ -176,25 +174,33 @@ linkit(target, source, isdir)
exists = !lstat(source, &sb);
/*
* If the file exists, and -f was specified, unlink it.
* Attempt the link.
* If the file exists, then unlink it forcibly if -f was specified
* and interactively if -i was specified.
*/
if (fflag && exists && unlink(source)) {
warn("%s", source);
return (1);
if (fflag && exists) {
if (unlink(source)) {
warn("%s", source);
return (1);
}
} else if (iflag && exists) {
fflush(stdout);
fprintf(stderr, "replace %s? ", source);
fflush(stderr);
first = ch = getchar();
while(ch != '\n' && ch != EOF)
ch = getchar();
if (first != 'y' && first != 'Y') {
fprintf(stderr, "not replaced\n");
return (1);
}
if ((first == 'y' || first == 'Y') && unlink(source)) {
if (unlink(source)) {
warn("%s", source);
return (1);
}
}
/* Attempt the link. */
if ((*linkf)(target, source)) {
warn("%s", source);
return (1);