From c51bf5ce454a204db30fb7e688308529d549a1eb Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 1 Feb 2013 22:59:46 +0000 Subject: [PATCH] [misc] set rufus-next to 1.3.3, update copyright * update copyright year * switch relevant files to UTF-8 (without signature). It's 2013 for crying out loud: if your file editor or file viewer can't handle plain UTF-8, go back to the 1980s! * also rename autogen.sh to bootstrap.sh --- _chver.sh | 2 +- autogen.sh => bootstrap.sh | 0 configure | 20 ++++++++++---------- configure.ac | 2 +- src/badblocks.h | 2 +- src/dos.c | 2 +- src/dos.h | 2 +- src/dos_locale.c | 4 ++-- src/drive.c | 2 +- src/format.c | 6 +++--- src/format.h | 4 ++-- src/icon.c | 2 +- src/iso.c | 4 ++-- src/license.h | 2 +- src/msapi_utf8.h | 2 +- src/net.c | 4 ++-- src/parser.c | 6 +++--- src/registry.h | 2 +- src/rufus.rc | 12 ++++++------ src/stdfn.c | 2 +- src/stdio.c | 2 +- src/syslinux.c | 2 +- src/vhd.c | 2 +- 23 files changed, 44 insertions(+), 44 deletions(-) rename autogen.sh => bootstrap.sh (100%) diff --git a/_chver.sh b/_chver.sh index 4b58564e..87c332b4 100644 --- a/_chver.sh +++ b/_chver.sh @@ -43,4 +43,4 @@ sed -f cmd.sed src/rufus.rc > src/rufus.rc~ sed 's/$/\r/' src/rufus.rc~ > src/rufus.rc rm src/rufus.rc~ rm cmd.sed -source autogen.sh +source bootstrap.sh diff --git a/autogen.sh b/bootstrap.sh similarity index 100% rename from autogen.sh rename to bootstrap.sh diff --git a/configure b/configure index 525a4279..2b51aa73 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rufus 1.3.2. +# Generated by GNU Autoconf 2.68 for rufus 1.3.3. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='1.3.2' -PACKAGE_STRING='rufus 1.3.2' +PACKAGE_VERSION='1.3.3' +PACKAGE_STRING='rufus 1.3.3' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='http://rufus.akeo.ie' @@ -1201,7 +1201,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 1.3.2 to adapt to many kinds of systems. +\`configure' configures rufus 1.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1267,7 +1267,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 1.3.2:";; + short | recursive ) echo "Configuration of rufus 1.3.3:";; esac cat <<\_ACEOF @@ -1355,7 +1355,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 1.3.2 +rufus configure 1.3.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1410,7 +1410,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 1.3.2, which was +It was created by rufus $as_me 1.3.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2225,7 +2225,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='1.3.2' + VERSION='1.3.3' cat >>confdefs.h <<_ACEOF @@ -4067,7 +4067,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 1.3.2, which was +This file was extended by rufus $as_me 1.3.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4121,7 +4121,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 1.3.2 +rufus config.status 1.3.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index eecd2734..db25a307 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [1.3.2], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [1.3.3], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/badblocks.h b/src/badblocks.h index 2f422e8b..9bd502b7 100644 --- a/src/badblocks.h +++ b/src/badblocks.h @@ -7,7 +7,7 @@ * * Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o * Copyright 1999 by David Beattie - * Copyright 2011-2012 by Pete Batard + * Copyright 2011-2013 by Pete Batard * * This file is based on the minix file system programs fsck and mkfs * written and copyrighted by Linus Torvalds diff --git a/src/dos.c b/src/dos.c index 8c236eaf..119d6671 100644 --- a/src/dos.c +++ b/src/dos.c @@ -2,7 +2,7 @@ * Rufus: The Reliable USB Formatting Utility * DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * (MS WinME DOS) or from the embedded FreeDOS resource files - * Copyright (c) 2011-2013 Pete Batard + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/dos.h b/src/dos.h index d439dd08..d70b8254 100644 --- a/src/dos.h +++ b/src/dos.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * MS-DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll - * Copyright (c) 2011-2012 Pete Batard + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/dos_locale.c b/src/dos_locale.c index 44edbd5e..fbb25403 100644 --- a/src/dos_locale.c +++ b/src/dos_locale.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * DOS keyboard locale setup - * Copyright (c) 2011-2013 Pete Batard + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -984,7 +984,7 @@ BOOL SetDOSLocale(const char* path, BOOL bFreeDOS) } if (bFreeDOS) { fprintf(fd, "!MENUCOLOR=7,0\nMENU\nMENU FreeDOS Language Selection Menu\n"); - fprintf(fd, "MENU 様様様様様様様様様様様様様様様\nMENU\n"); + fprintf(fd, "MENU \nMENU\n"); } else { fprintf(fd, "[MENU]\n"); } diff --git a/src/drive.c b/src/drive.c index a067e7cd..53b2a020 100644 --- a/src/drive.c +++ b/src/drive.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Drive access function calls - * Copyright (c) 2011-2012 Pete Batard + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/format.c b/src/format.c index 951a2c25..ca33ca68 100644 --- a/src/format.c +++ b/src/format.c @@ -1,8 +1,8 @@ /* * Rufus: The Reliable USB Formatting Utility * Formatting function calls - * Copyright (c) 2007-2009 Tom Thornhill/Ridgecrop - * Copyright (c) 2011-2013 Pete Batard + * Copyright 息 2007-2009 Tom Thornhill/Ridgecrop + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -403,7 +403,7 @@ static BOOL FormatFAT32(DWORD DriveIndex) if (qTotalSectors >= 0xffffffff) { // This is a more fundamental limitation on FAT32 - the total sector count in the root dir - // s 32bit. With a bit of creativity, FAT32 could be extended to handle at least 2^28 clusters + // 鱈s 32bit. With a bit of creativity, FAT32 could be extended to handle at least 2^28 clusters // There would need to be an extra field in the FSInfo sector, and the old sector count could // be set to 0xffffffff. This is non standard though, the Windows FAT driver FASTFAT.SYS won't // understand this. Perhaps a future version of FAT32 and FASTFAT will handle this. diff --git a/src/format.h b/src/format.h index ccc910b7..bb4402c7 100644 --- a/src/format.h +++ b/src/format.h @@ -1,8 +1,8 @@ /* * Rufus: The Reliable USB Formatting Utility * Formatting function calls - * Copyright (c) 2007-2009 Tom Thornhill/Ridgecrop - * Copyright (c) 2011-2012 Pete Batard + * Copyright 息 2007-2009 Tom Thornhill/Ridgecrop + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/icon.c b/src/icon.c index 98c17e54..793101b1 100644 --- a/src/icon.c +++ b/src/icon.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Extract icon from executable and set autorun.inf - * Copyright (c) 2012 Pete Batard + * Copyright 息 2012-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/iso.c b/src/iso.c index 60861257..e2ebc6e0 100644 --- a/src/iso.c +++ b/src/iso.c @@ -1,9 +1,9 @@ /* * Rufus: The Reliable USB Formatting Utility * ISO file extraction - * Copyright (c) 2011-2013 Pete Batard + * Copyright 息 2011-2013 Pete Batard * Based on libcdio's iso & udf samples: - * Copyright (c) 2003-2012 Rocky Bernstein + * Copyright 息 2003-2012 Rocky Bernstein * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/license.h b/src/license.h index a8d1a541..e1651c2e 100644 --- a/src/license.h +++ b/src/license.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Licensing Data - * Copyright 息 2011-2012 Pete Batard + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/msapi_utf8.h b/src/msapi_utf8.h index eb7c51eb..0feeac5a 100644 --- a/src/msapi_utf8.h +++ b/src/msapi_utf8.h @@ -2,7 +2,7 @@ * MSAPI_UTF8: Common API calls using UTF-8 strings * Compensating for what Microsoft should have done a long long time ago. * - * Copyright (c) 2010-2013 Pete Batard + * Copyright 息 2010-2013 Pete Batard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/net.c b/src/net.c index a77f0150..f581c0d6 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Networking functionality (web file download, check for update, etc.) - * Copyright (c) 2012-2013 Pete Batard + * Copyright 息 2012-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -183,7 +183,7 @@ const char* WinInetErrorString(void) case ERROR_GOPHER_NOT_GOPHER_PLUS: case ERROR_GOPHER_ATTRIBUTE_NOT_FOUND: case ERROR_GOPHER_UNKNOWN_LOCATOR: - return "Gopher? Really??? What is this? 1994?"; + return "Gopher? Really??? What is this, 1994?"; case ERROR_HTTP_HEADER_NOT_FOUND: return "The requested header could not be located."; case ERROR_HTTP_DOWNLEVEL_SERVER: diff --git a/src/parser.c b/src/parser.c index 585ab433..8941c28a 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Elementary Unicode compliant find/replace parser - * Copyright (c) 2012 Pete Batard + * Copyright 息 2012-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -295,7 +295,7 @@ char* insert_section_data(const char* filename, const char* section, const char* mode = 2; // UTF-16 (LE) break; case 0xBBEF: // Yeah, the UTF-8 BOM is really 0xEF,0xBB,0xBF, but - mode = 1; // find me a non UTF-8 file that actually begins with "鏤" + mode = 1; // find me a non UTF-8 file that actually begins with "誰損" break; default: mode = 0; // ANSI @@ -430,7 +430,7 @@ char* replace_in_token_data(const char* filename, const char* token, const char* mode = 2; // UTF-16 (LE) break; case 0xBBEF: // Yeah, the UTF-8 BOM is really 0xEF,0xBB,0xBF, but - mode = 1; // find me a non UTF-8 file that actually begins with "鏤" + mode = 1; // find me a non UTF-8 file that actually begins with "誰損" break; default: mode = 0; // ANSI diff --git a/src/registry.h b/src/registry.h index 4ccc180e..fc280b27 100644 --- a/src/registry.h +++ b/src/registry.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Registry access - * Copyright (c) 2012 Pete Batard + * Copyright 息 2012-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/rufus.rc b/src/rufus.rc index 67d7159d..147feaad 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.3.2.233" +CAPTION "Rufus v1.3.3.234" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -274,8 +274,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,2,233 - PRODUCTVERSION 1,3,2,233 + FILEVERSION 1,3,3,234 + PRODUCTVERSION 1,3,3,234 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -292,13 +292,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.3.2.233" + VALUE "FileVersion", "1.3.3.234" VALUE "InternalName", "Rufus" - VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)" + VALUE "LegalCopyright", "(c) 2011-2013 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.2.233" + VALUE "ProductVersion", "1.3.3.234" END END BLOCK "VarFileInfo" diff --git a/src/stdfn.c b/src/stdfn.c index c22dfa01..6baa19a0 100644 --- a/src/stdfn.c +++ b/src/stdfn.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard Windows function calls - * Copyright (c) 2013 Pete Batard + * Copyright 息 2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/stdio.c b/src/stdio.c index 1e287202..84bf3d8c 100644 --- a/src/stdio.c +++ b/src/stdio.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard User I/O Routines (logging, status, etc.) - * Copyright (c) 2011-2013 Pete Batard + * Copyright 息 2011-2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/syslinux.c b/src/syslinux.c index d8e50e87..1aec0ce5 100644 --- a/src/syslinux.c +++ b/src/syslinux.c @@ -2,7 +2,7 @@ * * Copyright 2003 Lars Munch Christensen - All Rights Reserved * Copyright 1998-2008 H. Peter Anvin - All Rights Reserved - * Copyright 2012 Pete Batard + * Copyright 2012-2013 Pete Batard * * Based on the Linux installer program for SYSLINUX by H. Peter Anvin * diff --git a/src/vhd.c b/src/vhd.c index 3b98d3a5..6467c1c7 100644 --- a/src/vhd.c +++ b/src/vhd.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Virtual Disk Handling functions - * Copyright (c) 2013 Pete Batard + * Copyright 息 2013 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by