shithub: scc

Info  •  Files  •  Log  •  Branches

[ar] Remove iflag

It is totally equivalent to bflag, so we can use only one of them.

--- a/ar/main.c

+++ b/ar/main.c

@@ -15,7 +15,7 @@

 char *argv0;

-static int bflag, iflag, vflag, cflag, lflag, uflag, aflag, haslist;

+static int bflag, vflag, cflag, lflag, uflag, aflag, haslist;

 static char *posname, *tmpafile1, *tmpafile2;

 struct arop {

@@ -238,7 +238,7 @@

 	while ((c = getc(op->tmp)) != EOF)

 		putc(c, op->dst);

-	if (bflag || iflag)

+	if (bflag)

 		copy(&op->hdr, op->size, op->src, op->dst);

 }

@@ -256,7 +256,7 @@

 	for ( ; *list; ++list)

 		archive(*list, op->dst, 'a');

-	if (bflag || iflag)

+	if (bflag)

 		copy(&op->hdr, op->size, op->src, op->dst);

 }

@@ -618,13 +618,9 @@

 		pos++;

 		posname = EARGF(usage());

 		break;

+	case 'i':

 	case 'b':

 		bflag = 1;

-		pos++;

-		posname = EARGF(usage());

-		break;

-	case 'i':

-		iflag = 1;

 		pos++;

 		posname = EARGF(usage());

 		break;