Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / cmd / license.c

diff --git a/cmd/license.c b/cmd/license.c
index b07de72d36ca0ccedd148f12f14336b3af53b1d4..1c0794f09527facd183fa0054388f4970a175bea 100644 (file)
--- a/cmd/license.c
+++ b/cmd/license.c
@@ -1,36 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 by OpenMoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-
-/* COPYING is currently 15951 bytes in size */
-#define LICENSE_MAX    20480
-
 #include <command.h>
 #include <malloc.h>
-#include <license.h>
 
-int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+#include "license_data_gz.h"
+#include "license_data_size.h"
+
+static int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       char *tok, *dst = malloc(LICENSE_MAX);
-       unsigned long len = LICENSE_MAX;
+       char *dst;
+       unsigned long len = data_size;
+       int ret = CMD_RET_SUCCESS;
 
+       dst = malloc(data_size + 1);
        if (!dst)
-               return -1;
+               return CMD_RET_FAILURE;
 
-       if (gunzip(dst, LICENSE_MAX, license_gz, &len) != 0) {
+       ret = gunzip(dst, data_size, (unsigned char *)data_gz, &len);
+       if (ret) {
                printf("Error uncompressing license text\n");
-               free(dst);
-               return -1;
+               ret = CMD_RET_FAILURE;
+               goto free;
        }
+
+       dst[data_size] = 0;
        puts(dst);
+
+free:
        free(dst);
 
-       return 0;
+       return ret;
 }
 
 U_BOOT_CMD(