Merge branch 'main' into next

[mirror_iproute2.git] / devlink / devlink.c

diff --git a/devlink/devlink.c b/devlink/devlink.c
index ca99732efd0051fd778d4a4e05621b8d14444f49..12431f1dae230008f44ac2c117b12d0f6bcf22e3 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -7912,43 +7912,16 @@ static void dl_free(struct dl *dl)
        free(dl);
 }
 
-static int dl_batch(struct dl *dl, const char *name, bool force)
+static int dl_batch_cmd(int argc, char *argv[], void *data)
 {
-       char *line = NULL;
-       size_t len = 0;
-       int ret = EXIT_SUCCESS;
-
-       if (name && strcmp(name, "-") != 0) {
-               if (freopen(name, "r", stdin) == NULL) {
-                       fprintf(stderr,
-                               "Cannot open file \"%s\" for reading: %s\n",
-                               name, strerror(errno));
-                       return EXIT_FAILURE;
-               }
-       }
-
-       cmdlineno = 0;
-       while (getcmdline(&line, &len, stdin) != -1) {
-               char *largv[100];
-               int largc;
-
-               largc = makeargs(line, largv, 100);
-               if (!largc)
-                       continue;       /* blank line */
-
-               if (dl_cmd(dl, largc, largv)) {
-                       fprintf(stderr, "Command failed %s:%d\n",
-                               name, cmdlineno);
-                       ret = EXIT_FAILURE;
-                       if (!force)
-                               break;
-               }
-       }
+       struct dl *dl = data;
 
-       if (line)
-               free(line);
+       return dl_cmd(dl, argc, argv);
+}
 
-       return ret;
+static int dl_batch(struct dl *dl, const char *name, bool force)
+{
+       return do_batch(name, force, dl_batch_cmd, dl);
 }
 
 int main(int argc, char **argv)