From: ikarus Date: Wed, 2 Apr 2014 19:46:25 +0000 (+0200) Subject: Updated nameing (svn -> git) & fixed whitespaces. X-Git-Tag: v1.1.0~7 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/9c6837165bbe5d7e01d7d4f96dcdad761451c2d1 Updated nameing (svn -> git) & fixed whitespaces. --- diff --git a/armsrc/util.c b/armsrc/util.c index 905bad25..a250e529 100644 --- a/armsrc/util.c +++ b/armsrc/util.c @@ -239,7 +239,7 @@ void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers return; } - strncat(dst, v->svnversion, len); + strncat(dst, v->gitversion, len); if(v->clean == 0) { strncat(dst, "-unclean", len); } else if(v->clean == 2) { diff --git a/include/proxmark3.h b/include/proxmark3.h index ee76875e..ce263ca1 100644 --- a/include/proxmark3.h +++ b/include/proxmark3.h @@ -89,7 +89,7 @@ struct version_information { char versionversion; /* Must be 1 */ char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */ char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */ - char svnversion[50]; /* String with the SVN revision */ + char gitversion[50]; /* String with the git revision */ char buildtime[30]; /* string with the build time */ } __attribute__((packed)); diff --git a/tools/mkversion.pl b/tools/mkversion.pl index de394a85..19616441 100644 --- a/tools/mkversion.pl +++ b/tools/mkversion.pl @@ -7,7 +7,7 @@ # --- Martin Holst Swende -# Clear environment locale so that svn will not use localized strings +# Clear environment locale so that git will not use localized strings $ENV{'LC_ALL'} = "C"; $ENV{'LANG'} = "C"; @@ -16,9 +16,9 @@ my $gitbranch = `git rev-parse --abbrev-ref HEAD`; my $clean = 2; my @compiletime = gmtime(); -my $fullgitinfo= $gitbranch . '/'.$gitversion; +my $fullgitinfo = $gitbranch . '/' . $gitversion; -$fullgitinfo=~ s/(\s)//g; +$fullgitinfo =~ s/(\s)//g; # Crop so it fits within 50 characters $fullgitinfo =~ s/.{50}\K.*//s;