Merge branch 'maint'

diff --git a/convert-objects.c b/convert-objects.c
index 4809f9199fa21dcd95ab508e26196080d49e8e88..90e7900e6d7aff2fadf9ba04f8d982733493411c 100644 (file)
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
                unsigned int mode;
                char *slash, *origpath;
 
-               if (!path || sscanf(buffer, "%o", &mode) != 1)
+               if (!path || strtoul_ui(buffer, 8, &mode))
                        die("bad tree conversion");
                mode = convert_mode(mode);
                path++;
@@ -194,7 +194,7 @@ static unsigned long parse_oldstyle_date(const char *buf)
                fmt++;
        } while (*buf && *fmt);
        printf("left: %s\n", buf);
-       return mktime(&tm);                             
+       return mktime(&tm);
 }
 
 static int convert_date_line(char *dst, void **buf, unsigned long *sp)