scripts/dtc: Update to upstream commit b06e55c88b9b

Sync to upstream dtc commit b06e55c88b9b ("Prevent crash on modulo by
zero"). This adds the following commits from upstream:

b06e55c Prevent crash on modulo by zero
b433450 Fix some bugs in processing of line directives
d728ad5 Fix crash on nul character in string escape sequence
1ab2205 Gracefully handle bad octal literals
1937095 Prevent crash on division by zero
d0b3ab0 libfdt: Fix undefined behaviour in fdt_offset_ptr()
d4c7c25 libfdt: check for potential overrun in _fdt_splice()
f58799b libfdt: Add some missing symbols to version.lds
af9f26d Remove duplicated -Werror in dtc Makefile
604e61e fdt: Add functions to retrieve strings
8702bd1 fdt: Add a function to get the index of a string
2218387 fdt: Add a function to count strings
554fde2 libfdt: fix comment block of fdt_get_property_namelen()
e5e6df7 fdtdump: Fix bug printing bytestrings with negative values
067829e Remove redundant fdtdump test code
897a429 Move fdt_path_offset alias tests to right tests section
2d1417c Add simple .travis.yml
f6dbc6c guess output file format
5e78dff guess input file format based on file content or file name
8b927bf tests: convert `echo -n` to `printf`
64c46b0 Fix crash with poorly defined #size-cells

Cc: Grant Likely <grant.likely@linaro.org>
Tested-by: Frank Rowand <frank.rowand@sonymobile.com>
Reviewed-by: Frank Rowand <frank.rowand@sonymobile.com>
Signed-off-by: Rob Herring <robh@kernel.org>

1 files changed, 60 insertions, 2 deletions

diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index 8c4add69a765..5fa23c406266 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -18,6 +18,8 @@
  *                                                                   USA
  */
 
+#include <sys/stat.h>
+
 #include "dtc.h"
 #include "srcpos.h"
 
@@ -104,11 +106,56 @@ static const char * const usage_opts_help[] = {
         NULL,
 };
 
+static const char *guess_type_by_name(const char *fname, const char *fallback)
+{
+        const char *s;
+
+        s = strrchr(fname, '.');
+        if (s == NULL)
+                return fallback;
+        if (!strcasecmp(s, ".dts"))
+                return "dts";
+        if (!strcasecmp(s, ".dtb"))
+                return "dtb";
+        return fallback;
+}
+
+static const char *guess_input_format(const char *fname, const char *fallback)
+{
+        struct stat statbuf;
+        uint32_t magic;
+        FILE *f;
+
+        if (stat(fname, &statbuf) != 0)
+                return fallback;
+
+        if (S_ISDIR(statbuf.st_mode))
+                return "fs";
+
+        if (!S_ISREG(statbuf.st_mode))
+                return fallback;
+
+        f = fopen(fname, "r");
+        if (f == NULL)
+                return fallback;
+        if (fread(&magic, 4, 1, f) != 1) {
+                fclose(f);
+                return fallback;
+        }
+        fclose(f);
+
+        magic = fdt32_to_cpu(magic);
+        if (magic == FDT_MAGIC)
+                return "dtb";
+
+        return guess_type_by_name(fname, fallback);
+}
+
 int main(int argc, char *argv[])
 {
         struct boot_info *bi;
-        const char *inform = "dts";
-        const char *outform = "dts";
+        const char *inform = NULL;
+        const char *outform = NULL;
         const char *outname = "-";
         const char *depname = NULL;
         bool force = false, sort = false;
@@ -213,6 +260,17 @@ int main(int argc, char *argv[])
                 fprintf(depfile, "%s:", outname);
         }
 
+        if (inform == NULL)
+                inform = guess_input_format(arg, "dts");
+        if (outform == NULL) {
+                outform = guess_type_by_name(outname, NULL);
+                if (outform == NULL) {
+                        if (streq(inform, "dts"))
+                                outform = "dtb";
+                        else
+                                outform = "dts";
+                }
+        }
         if (streq(inform, "dts"))
                 bi = dt_from_source(arg);
         else if (streq(inform, "fs"))