shithub: scc

Info  •  Files  •  Log  •  Branches

[ar] Add insert()

This function is used in -r to add the files that weren't present
in the file.

--- a/ar/main.c

+++ b/ar/main.c

@@ -216,6 +216,8 @@

 	int where;

 	if (inlist(op->fname, argc, argv)) {

+		if (vflag)

+			printf("m - %s\n", op->fname);

 		where = INDOT;

 	} else if (posname && !strcmp(posname, op->fname)) {

 		where = (bflag) ? AFTER : BEFORE;

@@ -227,6 +229,15 @@

 }

 static void

+insert(int argc, char *argv[])

+{

+	for (; argc-- > 0; ++argv) {

+		archive(*argv, tmps[INDOT].fp, 'r');

+		*argv = NULL;

+	}

+}

+

+static void

 update(struct member *op, int argc, char *argv[])

 {

 	int where;

@@ -233,6 +244,8 @@

 	FILE *fp = tmps[BEFORE].fp;

 	if (inlist(op->fname, argc, argv)) {

+		if (vflag)

+			printf("r - %s\n", op->fname);

 		archive(op->fname, tmps[op->cur].fp, 'r');

 		return;

 	} else if (posname && !strcmp(posname, op->fname)) {

@@ -491,6 +504,7 @@

 	switch (key) {

 	case 'r':

 		run(fp, argc, argv, update);

+		insert(argc, argv);

 		merge();

 		break;

 	case 'm':