diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-20 13:27:40 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-20 13:27:44 +0900 |
| commit | 842ebc0fa15fca613e0c9fce10dd63fa09d27666 (patch) | |
| tree | ac48c8ec511c025b1b479462056510eedc3ac6bc /common.c | |
| parent | 3d6ee8c3ccc0f65c7c87122dba80908ae751aa16 (diff) | |
| download | dos2unix-842ebc0fa15fca613e0c9fce10dd63fa09d27666.tar.gz dos2unix-842ebc0fa15fca613e0c9fce10dd63fa09d27666.tar.bz2 dos2unix-842ebc0fa15fca613e0c9fce10dd63fa09d27666.zip | |
Imported Upstream version 6.0.4
Change-Id: I3ce28283323425d17877da03683ac6a2b70f2382
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'common.c')
| -rw-r--r-- | common.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Erwin Waterlander + * Copyright (C) 2009-2013 Erwin Waterlander * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -215,12 +215,17 @@ Usage: %s [options] [file ...] [-n infile outfile ...]\n\ -n, --newfile write to new file\n\ infile original file in new file mode\n\ outfile output file in new file mode\n\ - -o, --oldfile write to old file\n\ + -o, --oldfile write to old file (default)\n\ file ... files to convert in old file mode\n\ -q, --quiet quiet mode, suppress all warnings\n\ always on in stdio mode\n\ -s, --safe skip binary files (default)\n"), progname, VER_REVISION, VER_DATE, progname); +#ifdef D2U_UNICODE + fprintf(stderr, _("\ + -ul, --assume-utf16le Assume that the input format is UTF-16LE\n\ + -ub, --assume-utf16be Assume that the input format is UTF-16BE\n")); +#endif #ifdef S_ISLNK fprintf(stderr, _("\ -F, --follow-symlink follow symbolic links and convert the targets\n\ @@ -232,6 +237,7 @@ Usage: %s [options] [file ...] [-n infile outfile ...]\n\ -V, --version display version number\n")); } +#define MINGW32_W64 1 void PrintVersion(char *progname) { @@ -255,6 +261,8 @@ void PrintVersion(char *progname) fprintf(stderr, "%s", _("Windows 64 bit version (MinGW-w64).\n")); #elif defined(__WATCOMC__) && defined(__NT__) fprintf(stderr, "%s", _("Windows 32 bit version (WATCOMC).\n")); +#elif defined(_WIN32) && defined(__MINGW32__) && (D2U_COMPILER == MINGW32_W64) + fprintf(stderr, "%s", _("Windows 32 bit version (MinGW-w64).\n")); #elif defined(_WIN32) && defined(__MINGW32__) fprintf(stderr, "%s", _("Windows 32 bit version (MinGW).\n")); #elif defined(_WIN64) && defined(_MSC_VER) |