diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2009-10-31 12:34:36 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2009-10-31 12:34:36 +0100 |
commit | c8a9a6550b84412f919b772a9cb8db1e3ef79d19 (patch) | |
tree | 270e253e13f67b366970cf2f07f5c06dd4257520 /dovecot-version.c | |
parent | aad2cd42ee3d71920648b649e759403b0cb0e138 (diff) | |
parent | 771fe630d71993b9d270a9a6145ecaa8510c4f1c (diff) | |
download | dovecot-antispam-c8a9a6550b84412f919b772a9cb8db1e3ef79d19.tar.gz dovecot-antispam-c8a9a6550b84412f919b772a9cb8db1e3ef79d19.tar.xz dovecot-antispam-c8a9a6550b84412f919b772a9cb8db1e3ef79d19.zip |
Merge remote branch 'base/master'
Diffstat (limited to 'dovecot-version.c')
-rw-r--r-- | dovecot-version.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/dovecot-version.c b/dovecot-version.c index fbb7a88..7733e60 100644 --- a/dovecot-version.c +++ b/dovecot-version.c @@ -5,8 +5,9 @@ int main(int argc, char **argv) { - char *v = PACKAGE_STRING, *e; - int maj = 0, min = 0; + const char *v = PACKAGE_STRING; + char *e; + int maj = 0, min = 0, patch = 0; if (strncmp(v, "dovecot ", 8) && strncmp(v, "Dovecot ", 8)) return 1; @@ -24,11 +25,25 @@ int main(int argc, char **argv) if (v == e) return 1; + /* not end of string yet? */ + if (*e) { + v = e + 1; + + patch = strtol(v, &e, 10); + if (v == e) + return 1; + } + printf("/* Auto-generated file, do not edit */\n\n"); - printf("#define DOVECOT_VERSION_CODE(maj, min) ((maj)<<8 | (min))\n\n"); + printf("#define DOVECOT_VERSION_CODE(maj, min, patch) " + "((maj)<<16 | ((min)<<8) | (patch))\n\n"); - printf("#define DOVECOT_VERSION 0x%.2x%.2x\n", maj, min); - printf("#define ANTISPAM_STORAGE \"antispam-storage-%d.%d.c\"\n", maj, min); + printf("#define DOVECOT_VERSION " + "0x%.2x%.2x%.2x\n", maj, min, 0); + printf("#define DOVECOT_VPATCH " + "0x%.2x%.2x%.2x\n", maj, min, patch); + printf("#define ANTISPAM_STORAGE " + "\"antispam-storage-%d.%d.c\"\n", maj, min); return 0; } |