diff --git a/scripts/createmsi.pl b/scripts/createmsi.pl index 4f2ffb21..7009ede3 100644 --- a/scripts/createmsi.pl +++ b/scripts/createmsi.pl @@ -839,7 +839,7 @@ sub sign { # for some unclear reason as of 2024-02-24 this requires # now requires osslsigncode 2.7 and the verification - # using ossslsigncode fails eventhough the msi is apparently + # using ossslsigncode fails even though the msi is apparently # fine (no complaints when installing) my $cmd = "osslsigncode sign"; # $cmd .= " -nolegacy"; diff --git a/src/librttopo/osgeo4w/patch b/src/librttopo/osgeo4w/patch index 65317e41..39f5447f 100644 --- a/src/librttopo/osgeo4w/patch +++ b/src/librttopo/osgeo4w/patch @@ -264,7 +264,7 @@ diff -Nur librttopo/headers/librttopo_geom.h ../librttopo/headers/librttopo_geom + +/****************************************************************** +* RTGBOX structure. -+* We include the flags (information about dimensinality), ++* We include the flags (information about dimensionality), +* so we don't have to constantly pass them +* into functions that use the RTGBOX. +*/ @@ -1002,7 +1002,7 @@ diff -Nur librttopo/headers/librttopo_geom.h ../librttopo/headers/librttopo_geom + +/** +* Add a component, allocating extra space if necessary. The compoundcurve -+* takes owership of the passed geometry. ++* takes ownership of the passed geometry. +*/ +extern int rtcompound_add_rtgeom(const RTCTX *ctx, RTCOMPOUND *comp, RTGEOM *geom); + @@ -1445,7 +1445,7 @@ diff -Nur librttopo/headers/librttopo_geom.h ../librttopo/headers/librttopo_geom + */ +/** For GML3 only, include srsDimension attribute in output */ +#define RT_GML_IS_DIMS (1<<0) -+/** For GML3 only, declare that datas are lat/lon. Swaps axis order */ ++/** For GML3 only, declare that data are lat/lon. Swaps axis order */ +#define RT_GML_IS_DEGREE (1<<1) +/** For GML3, use rather than for lines */ +#define RT_GML_SHORTLINE (1<<2) @@ -1962,7 +1962,7 @@ diff -Nur librttopo/headers/librttopo_geom.h ../librttopo/headers/librttopo_geom +#define TWKB_BBOX 0x01 /* User wants bboxes */ +#define TWKB_SIZE 0x02 /* User wants sizes */ +#define TWKB_ID 0x04 /* User wants id */ -+#define RTTWKB_NO_TYPE 0x10 /* No type because it is a sub geoemtry */ ++#define RTTWKB_NO_TYPE 0x10 /* No type because it is a sub geometry */ +#define TWKB_NO_ID 0x20 /* No ID because it is a subgeoemtry */ +#define TWKB_DEFAULT_PRECISION 0 /* Aim for 1m (or ft) rounding by default */ + diff --git a/src/saga/osgeo4w/patch b/src/saga/osgeo4w/patch index a0e312d4..a175e343 100644 --- a/src/saga/osgeo4w/patch +++ b/src/saga/osgeo4w/patch @@ -4,12 +4,12 @@ diff -ur saga-9.5.1/saga-gis/CMakeLists.txt ../saga-9.5.1/saga-gis/CMakeLists.tx @@ -23,7 +23,7 @@ - # Platform independant compiler requirements + # Platform independent compiler requirements -set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to be used") +set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to be used") set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "The C++ standard is required") - # Platform dependant compiler requirements + # Platform dependent compiler requirements @@ -34,10 +34,10 @@ option(PARALLEL_BUILD "Multi-processor compilation (/MP)" ON) diff --git a/src/setup/CHANGES b/src/setup/CHANGES index 93efdcd2..cd7983cc 100644 --- a/src/setup/CHANGES +++ b/src/setup/CHANGES @@ -13,7 +13,7 @@ Version HEAD Version 2.573.2.2 - - Fix crash when trying to MD5 a non-existant package file that failed to + - Fix crash when trying to MD5 a non-existent package file that failed to download. Version 2.573.2.1 diff --git a/src/setup/ChangeLog b/src/setup/ChangeLog index 51442d44..55b08bd7 100644 --- a/src/setup/ChangeLog +++ b/src/setup/ChangeLog @@ -219,7 +219,7 @@ 2007-02-17 Brian Dessent - * script.cc (Script::run): Check for existance of script file and + * script.cc (Script::run): Check for existence of script file and return without doing anything if it does not exist. 2006-12-26 Max Bowsher @@ -287,7 +287,7 @@ 2006-04-25 Brian Dessent * COPYING: New file (GPL). - * Makfile.am (EXTRA_DIST): Add COPYING. + * Makefile.am (EXTRA_DIST): Add COPYING. 2006-04-17 Max Bowsher @@ -703,9 +703,9 @@ (IDD_SITE): Provide static text with an ID so that it can be resized properly. Move pushbutton slightly to right so that it doesn't crowd edit box. - (IDD_SPLASH): Change copyright displayed on spash screen to be generic + (IDD_SPLASH): Change copyright displayed on splash screen to be generic since the actual list of contributors is long. - (IDD_CHOOSE): Add checkbox. Resize other controls to accomodate. + (IDD_CHOOSE): Add checkbox. Resize other controls to accommodate. (IDD_PREREQ): New dialog. (SPIN): Delete duplicated bitmap resource. (IDB_RTARROW): Remove unused bitmap resource. @@ -785,7 +785,7 @@ 2005-05-07 Max Bowsher * install.cc (md5_one): Make the MD5 checking done at install time - display a progess GUI, as the MD5 checking done at other times does. + display a progress GUI, as the MD5 checking done at other times does. 2005-05-07 Max Bowsher @@ -850,7 +850,7 @@ 2005-05-05 Brian Dessent * root.cc (dialog_cmd): Remove. Use OnMessageCmd instead. - (RootPage::Create): Accomodate above change. + (RootPage::Create): Accommodate above change. * root.h (class RootPage): Add prototype for OnMessageCmd. @@ -1011,7 +1011,7 @@ 2005-05-05 Brian Dessent * res.rc: (IDC_CHOOSE): Widen 'view' button by 6px horizontally and - 4px vertically. Adjust other controls to accomodate. + 4px vertically. Adjust other controls to accommodate. (CREATEPROCESS_MANIFEST_RESOURCE_ID): Define so that manifest is included in the binary. @@ -1343,7 +1343,7 @@ * proppage.cc (PropertyPage::DialogProc): Wrap in a TOPLEVEL_CATCH block, since allowing exceptions to unwind into the guts of Windows is - quite disasterous. + quite disastrous. 2004-11-19 Max Bowsher @@ -1434,7 +1434,7 @@ * cistring.cc, cistring.h: Remove this now-redundant class. * Makefile.am: Remove mention of the above removed files. * res.rc, resource.h: Remove obsolete strings and IDs, both those - obseleted by and obselete before the above changes. + obsoleted by and obsolete before the above changes. * res.rc: Merge the 2 adjacent STRINGTABLEs. 2004-10-27 Max Bowsher @@ -1500,7 +1500,7 @@ to a way that does not require hardcoding modified automake output back into its input. - * Makefile.am (AM_CXXFLAGS, BASECXXFLAGS): Seperate out -Werror. + * Makefile.am (AM_CXXFLAGS, BASECXXFLAGS): Separate out -Werror. (autoload.o): Drop this rule, -finline-functions is no longer required and -Werror is acceptable here now we have __attribute__ ((used)). (WARNONLY_CFLAGS, inilex.o): Drop these. @@ -1669,7 +1669,7 @@ Used internally by resize logic. (EnumPages): New. Used internally by resize logic: resizes the property sheet's individual pages. - (PropSheetWndProc): New. Hook for the propery sheet window proc. + (PropSheetWndProc): New. Hook for the property sheet window proc. (PropSheetProc): More style tweaks, add maximize box and thick border as well. Hook into the property sheet's window proc. (PropSheet::AdjustPageSize): New. Adjust the metrics of a single page @@ -1726,7 +1726,7 @@ including that from splash.cc into new function... (PropertyPage::setTitleFont): Create, using moved code. Change font "MS Sans Serif" to "MS Shell Dlg" in line with recent res.rc change. - Set font for IDC_STATIC_WELCOME_TITLE here, to allow easy re-use of + Set font for IDC_STATIC_WELCOME_TITLE here, to allow easy reuse of style for future "Finished" page. 2003-08-02 Gary R. Van Sickle @@ -1916,7 +1916,7 @@ (packagemeta::setDefaultCategories): set categories for packages with none. * package_meta.cc: Move visit_if out. Adjust users for - full paramterised operation. + full parameterised operation. (packagemeta::hasNoCategories): Implement. (packagemeta::setDefaultCategories): Implement. * choose.cc (ChooserPage::fillMissingCategory): Use visit_if to @@ -2149,7 +2149,7 @@ retype it. * main.cc (main): Load and save all user settings. * site.cc (SiteSetting::save): Migrate logic from save_site_url. - (SitePage::OnNext): Use ChosenSites.save() to remove uneeded + (SitePage::OnNext): Use ChosenSites.save() to remove unneeded save_site_url call. (save_site_url): Delete. * site.h (save_site_url): Remove declaration. @@ -2823,7 +2823,7 @@ * choose.cc (ChooserPage::OnNext): Remove extracted comment. * package_version.cc (processOneDependency): Return once selecting - a package (bugfix to prevous rework). + a package (bugfix to previous rework). Log if the default trust fails the package specification. 2002-11-26 Robert Collins @@ -3288,7 +3288,7 @@ out from process_src, as it now occurs at separate times. (IniDBBuilderPackage::buildPackageRequirement): Remove. (IniDBBuilderPackage::buildSourceName): Use renamed package - specifiation accessor for clarity. + specification accessor for clarity. (IniDBBuilderPackage::buildSourceNameVersion): Ditto. (IniDBBuilderPackage::add_correct_version): Use STL iterators rather than custom code. @@ -3480,8 +3480,8 @@ (IniDBBuilder::buildMaintainer): Who maintains the package? (IniDBBuilder::buildArchitecture): What platform is it for? (IniDBBuilder::buildInstallSize): How big is the binary download? - (IniDBBuilder::buildInstallMD5): Whats the MD5 on the binary? - (IniDBBuilder::buildSourceMD5): Whats the MD5 on the source package? + (IniDBBuilder::buildInstallMD5): What's the MD5 on the binary? + (IniDBBuilder::buildSourceMD5): What's the MD5 on the source package? (IniDBBuilder::buildBeginRecommends): What other packages are recommended with this one? (IniDBBuilder::buildBeginSuggests): And suggested? @@ -3503,12 +3503,12 @@ operator act on? * IniDBBuilder.h: Declare all the IniDBBuilder.cc changes. * IniDBBuilderPackage.cc: As for IniDBBuilder.cc. - (IniDBBuilderPackage::IniDBBuilderPackage): Iniitialize new members. + (IniDBBuilderPackage::IniDBBuilderPackage): Initialize new members. (IniDBBuilderPackage::process_src): Streamline and split out functionality. (IniDBBuilderPackage::setSourceSize): From process_src. * IniDBBuilderPackage.h: Declare the IniDBBuilderPackage.cc changes. - (IniDBBuilderPackage::currentSpec): Track the in-progress specifiation. + (IniDBBuilderPackage::currentSpec): Track the in-progress specification. (IniDBBuilderPackage::currentOrList): Track the current Or list. (IniDBBuilderPackage::currentAndList): Track the current And list. * IniParseFeedback.cc (IniParseFeedback::progress): Provide completion @@ -3537,7 +3537,7 @@ (cygpackage::getnextfile): Ditto. * download.cc: Use LogSIngletion calls throughout. (validateCachedPackage): A refactoring of the - check_for_cached code to eliminate duplciation. + check_for_cached code to eliminate duplication. (check_for_cached): Use validateCachedPackage to check packages. * ini.cc (GuiParseFeedback): Provide gui feedback on ini name and parsing progress. @@ -3546,7 +3546,7 @@ progress reporting. * inilex.l: Identify new symbols - operators, and multi line plain text. Releases files. - * inilintmain.cc (show_help): Provide basic infomation on inilint. + * inilintmain.cc (show_help): Provide basic information on inilint. * iniparse.y: Adjust for the new builder syntax, and process debian Release files. * io_stream_file.cc: Always include mkdir.h. @@ -3861,12 +3861,12 @@ * archive.cc: Remove unneeded includes. * archive_tar.cc: Remove unneeded includes. * archive_tar.h: Add required include. - * archive_tar_file.cc: Remove unneded includes. + * archive_tar_file.cc: Remove unneeded includes. * choose.cc: Remove unneeded includes: 2002-05-04 Robert Collins - * io_stream.cc: Use the new log interface thruout. + * io_stream.cc: Use the new log interface throughout. 2002-05-04 Robert Collins @@ -3883,12 +3883,12 @@ (setup_SOURCES): Add the new log interface and the concrete File implementation. * Makefile.in: Regenerate. - * archive.cc: Use the new log interface thruout. + * archive.cc: Use the new log interface throughout. * archive_tar.cc: Ditto. * main.cc: Ditto. * dialog.cc (fatal): Use the new log interface. * ini.cc (do_ini_thread): Use the log interface to exit. - * isntall.cc (do_install_thread): Ditto. + * install.cc (do_install_thread): Ditto. * netio.cc (auth_cmd): Ditto. * msg.cc (fatal): Ditto. * localdir.cc (save_local_dir): Save to different files depending on @@ -3905,13 +3905,13 @@ * Makefile.am (inilint_SOURCES): Add more requirements. (setup_SOURCES): Add new Builder base and concrete classes. * Makefile.in: Regenerate. - * String++.cc (String::String): Implement int contructor. + * String++.cc (String::String): Implement int constructor. * String++.h (String): Declare int constructor. * archive_tar.cc (archive_tar::next_file_name): Return String() when no filename exists. * archive_tar.h (archive_tar_file): Remove get_next_filename method, it's not needed. - * ini.cc: Replace IniState wuth IniDBBuilderPacakge. + * ini.cc: Replace IniState with IniDBBuilderPacakge. (find_routine): Use new IniDBBuilder to configure the parser. (do_local_ini): Ditto. (do_remote_ini): Ditto. @@ -4039,7 +4039,7 @@ * iniparse.y: Allow calculation of MD5 sums, and allow src only packages. (process_src): New helper function. - * isntall.cc (install_one_source): Check MD5 sums when possible. + * install.cc (install_one_source): Check MD5 sums when possible. Throw exceptions on errors. (do_install_thread): Handle exceptions for installation calls. * package_source.h: Store MD5 information. @@ -4053,10 +4053,10 @@ 2002-04-29 Robert Collins - * Makefile.am: Remove dependecy rules that automake emits. + * Makefile.am: Remove dependency rules that automake emits. Correct badly copied dependency info for manually compiled files. (setup_SOURCES): Add all used headers. - (EXTRA_DIST): Include non compilate but required sources. + (EXTRA_DIST): Include non compile but required sources. (setup_LDADD): Remove mingw32, it is autodetected. * Makefile.in: Regenerate. * String++.h: sys/types is a system header. @@ -4083,7 +4083,7 @@ routine. Use ExitThread. (do_download_site-Info): Use Win32 threads. - * state.cc: Explicity declare variables to avoid header conflicts + * state.cc: Explicitly declare variables to avoid header conflicts caused by '#define extern" on cygwin. * win32.h: Include if it exists. (_MAX_PATH): Define as MAX_PATH when not defined by windows.h. @@ -4223,7 +4223,7 @@ * mklink2.cc: Moved from mklink2.c to avoid 'not a prototype error'. Make g++ compatible. * mklink2.c: Remove. - * site.cc (site_list_type::init): Delete the correct memory addres. + * site.cc (site_list_type::init): Delete the correct memory address. Thanks to Pavel Tsekov for tracking this down. 2002-03-20 Robert Collins @@ -4472,7 +4472,7 @@ * String++.h: New file, declares a reference counting string class. * archive.cc: Include String++ instead of concat. (archive::extract_file): Convert char * usage to Strings. - * archive.h: Inlude the String++ header. + * archive.h: Include the String++ header. (archive::extract_file): Update prototype. (archive::next_file_name): Convert to a String. (archive::linktarget): Ditto. @@ -4821,7 +4821,7 @@ 2002-01-22 Robert Collins - * log.cc (exit_setup): When saving to the download dir, explicity + * log.cc (exit_setup): When saving to the download dir, explicitly specify the path. 2002-01-22 Robert Collins @@ -4904,13 +4904,13 @@ (view::clear_view): Ditto. (view::views::operator++): Ditto. (view::click): Ditto. - (default_trust): Adjust for moved statics. + (default_trust): Adjust for moved statistics. (pick_pkg_line::paint): Moved to PickPackageLine.cc. (pick_pkg_line::click): Ditto. (pick_category_line::actiontext): Moved to PickCategoryLine.cc (pick_category_line::paint): Ditto. (pick_category_line::click): Ditto. - (set_view_mode): Adjust for moved statics. + (set_view_mode): Adjust for moved statistics. (create_listview): Ditto. * choose.h: Remove Category and packagemeta forward defines - not needed. @@ -5026,7 +5026,7 @@ (topbucket::empty): Rename to pick_category_line::empty. (topbucket::~topbucket): Remove. (paint): Use the new view::views class. - Don't paint 'all' as a category when showing package categoies. + Don't paint 'all' as a category when showing package categories. (pick_category_line::actiontext): New method. (pick_category_line::paint): Make showing the category optional, and show the 'category action'. @@ -5060,7 +5060,7 @@ (replace_one): Handle upgrades separate from removal or new installs. (install_one_source): Handle in use files. (install_one): Don't repeat upgrades. - (do_install_thread): Initialize new statics. + (do_install_thread): Initialize new statistics. Order actions as uninstall, replace, install. Warn about rebooting if needed. * res.rc (IDS_REBOOT_REQUIRED): New string. @@ -5133,7 +5133,7 @@ * Makefile.in (realclean): more clean. (OBJS): Add script.o. * postinstall.cc (run_script_in_etc_postinstall): New function. - (do_postinstall): Split off new funtion init_run_script (). + (do_postinstall): Split off new function init_run_script (). (init_run_script): (run): (run_script): Move to script.cc. Replace some deprecated remove @@ -5592,7 +5592,7 @@ * desktop.cc (make_passwd_group): Use list syntax for package list. * download.cc (do_download): Use list syntax for package list. * fromcwd.cc (found_file): Use list syntax for package list. - * iniparse.y (pacakges): Use list syntax for package list. + * iniparse.y (packages): Use list syntax for package list. * install.cc (uninstall_one): Use list syntax for package list. (do_install): Use list syntax for package list. * io_stream.h (io_stream): Prevent non-child direct creation of the @@ -5664,8 +5664,8 @@ (load_dialog): Select all the user chosen sites by default. (save_dialog): Adjust for multiple selection semantics. (save_site_url): Save all user chosen sites. - (dialog_cmd): Don't save the dialog when the listbox recieves a message - - thats not needed. + (dialog_cmd): Don't save the dialog when the listbox receives a message + - that's not needed. Remove obsolete other_url reference. (dialog_proc): Use all_site_list instead of site_list. (site_sort): Remove. @@ -5733,7 +5733,7 @@ * io_stream_cygfile.h (io_stream_cygfile::get_size): Declare this. * io_stream_file.cc (io_stream_file::get_size): Implement this. * io_stream_file.h (io_stream_file::get_size): Declare this. - * io_stream_memory.h: Include errno as it's neded to parse the header. + * io_stream_memory.h: Include errno as it's needed to parse the header. (io_stream_memory::get_size): Implement this. (io_stream_memory::st_size): Delete this. * list.h: Change getnth into the [] operator. @@ -5935,7 +5935,7 @@ 2001-11-23 Robert Collins * Makefile.in (OBJS): Add package_version. - * ategory.cc (Category::Category): Update constructors. + * category.cc (Category::Category): Update constructors. * category_list.cc (CategoryList::register_category): Insert correctly. * choose.cc: Include package_version.h, not package.h. * cygpackage.cc: Ditto. @@ -5953,7 +5953,7 @@ (uninstall_one): Use packagemeta->uninstall to perform the uninstallation. Don't uninstall source packages. (do_install): Just can uninstall_one once as we ignore source packages - now. Don't copy the installed.old database accross, instead iterate + now. Don't copy the installed.old database across, instead iterate through the packagedb packages list and write the installed packages out. * package_db.cc: Include package_version.h, not package.h. @@ -6400,7 +6400,7 @@ 2001-11-06 Robert Collins * fromcwd: Fix compiler warnings for cvsid. - (canonicalize_version): Fix compilter warnings. + (canonicalize_version): Fix compiler warnings. (do_fromcwd): Ditto. * version.h: Fix compiler warnings for canonicalize_version. @@ -6555,7 +6555,7 @@ 2001-10-12 Christopher Faylor - * Makefile.in: Accomodate changes to w32api_include macro. + * Makefile.in: Accommodate changes to w32api_include macro. 2001-10-12 Christopher Faylor @@ -6632,7 +6632,7 @@ Sat Jul 7 00:40:28 2001 Christopher Faylor Fri Jul 6 18:08:49 2001 Christopher Faylor - * choose.cc (isinstalled): Modify to properly accomodate special case + * choose.cc (isinstalled): Modify to properly accommodate special case of "download only". (set_action): Check downloaded components, not installed components if "download only". @@ -6787,7 +6787,7 @@ Sun Jun 17 12:06:14 2001 Christopher Faylor Sat Jun 16 11:33:51 2001 Michael A Chase - * choose.cc (_Info::_Info): Test _source paramenter for non-NULL rather + * choose.cc (_Info::_Info): Test _source parameter for non-NULL rather than zeroed "source" element. Fri Jun 15 20:54:43 2001 Christopher Faylor @@ -6812,7 +6812,7 @@ Fri Jun 15 00:01:51 2001 Christopher Faylor (choose_caption): Display "Retrieve" rather than "Reinstall" when just downloading. (do_choose): Sort packages after all packages have been read. - Accomodate the fact that first element in trust array is empty so that + Accommodate the fact that first element in trust array is empty so that log files don't report the wrong trust value. * iniparse.y (new_package): Malloc space for package name or suffer memory corruption. @@ -6958,7 +6958,7 @@ Sun May 27 15:42:18 2001 Christopher Faylor (read_mounts): Explicitly clear root_here to allow multiple uses of this function. Ensure that there is no garbage in the table when we've exhausted all of the mounts in the registry. - (cygpath): Accomodate ./ in path. + (cygpath): Accommodate ./ in path. Sun May 27 02:59:07 2001 Christopher Faylor @@ -7069,7 +7069,7 @@ Tue May 8 23:33:38 2001 Christopher Faylor Mon May 7 23:33:30 2001 Matt Hargett * winsup/cinstall/res.rc: Added accelerators and improved focus order. - Removed WS_DISABLED from "OK" buttons to accomodate default focus + Removed WS_DISABLED from "OK" buttons to accommodate default focus changes in net.cc and source.cc. * winsup/cinstall/net.cc (dialog_proc): If no radio button is selected, a default is selected. @@ -7108,7 +7108,7 @@ Wed Apr 18 16:01:21 2001 Christopher Faylor * filemanip.h: New file. * choose.cc (find_tar_ext): New function. Returns TRUE if .tar.gz or .tar.bz2 found. - (scan2): Reorganize to use find_tar_ext, accomodating .bz2 extension. + (scan2): Reorganize to use find_tar_ext, accommodating .bz2 extension. (read_installed_db): Ditto. (do_choose): Ditto. * fromcwd.cc (found_file): Ditto. @@ -7353,7 +7353,7 @@ Sun Nov 5 12:51:42 2000 Jason Tishler 2000-10-02 Jason Tishler * root.cc (is_admin): New function. - (read_mount_table): Check for administrative priviledges and set + (read_mount_table): Check for administrative privileges and set installation scope as appropriate. 2000-09-28 DJ Delorie @@ -7477,7 +7477,7 @@ Mon Sep 11 19:35:24 2000 Christopher Faylor * hash.cc, hash.h: new * Makefile: add hash.o * choose.cc: enable "uninstall" option - * download.cc: invert action test to accomodate uninstalling + * download.cc: invert action test to accommodate uninstalling * ini.h: add ACTION_UNINSTALL * install.cc: add uninstall functionality * res.rc: make install tag changeable @@ -7764,7 +7764,7 @@ Tue May 2 00:56:41 2000 Christopher Faylor * setup.c (cleanup): Inverse order of deletion stands a better chance of deleting cygpath.exe. Still seems to suffer from occasional races, though. - (cleanup_on_signal): Perform convoluted dance to accomodate win95 and + (cleanup_on_signal): Perform convoluted dance to accommodate win95 and w2k. (output_file): Defend against an unlikely handle leak. (main): Don't set up signal handling until we have something special to @@ -7825,7 +7825,7 @@ Sat Apr 29 23:27:14 2000 Christopher Faylor (filematches): New function. Tests if filename matches one of a list of packages to install. (recurse_dirs): Accept list of packages to install. Generalize tar.gz - test to accomodate _tar.gz. + test to accommodate _tar.gz. (prompt): Ensure that stdout is flushed prior to asking for input. (findhref): Initialize variables to quiet a compiler warning. (processdirlisting): Accept list of packages to install. Special case @@ -7923,7 +7923,7 @@ Sat Apr 22 16:37:03 2000 Christopher Faylor downloaded. (processdirlisting): Always download if file size does not match. Prompt when download fails for some reason. - (getdownloadsource): Accomodate findhref argument changes. + (getdownloadsource): Accommodate findhref argument changes. Sat Apr 22 15:13:42 2000 Christopher Faylor @@ -7967,7 +7967,7 @@ Mon Apr 17 19:20:52 2000 Vadim Egorov * setup.c (geturl): Use alternative method for finding filename part of a URL. - (processdirlisting): Accomodate strange output from non-MS ftp proxy. + (processdirlisting): Accommodate strange output from non-MS ftp proxy. (downloaddir): Unlink file containing dir listing. (downloadfrom): Ditto. @@ -8026,7 +8026,7 @@ Thu Apr 13 01:11:45 2000 Christopher Faylor (main): Track elapsed install time. Mount root. * starry.h: Add index field to strarry for tracking of tarx's usage of this structure. - * xsystem.c (xcreate_process): Return proces handle when not waiting. + * xsystem.c (xcreate_process): Return process handle when not waiting. Mon Apr 10 22:44:56 2000 Christopher Faylor @@ -8046,7 +8046,7 @@ Mon Apr 10 22:44:56 2000 Christopher Faylor Mon Apr 10 20:33:40 2000 Christopher Faylor * xsystem.c: New file. - * Makefile.in: Accomodate new file. + * Makefile.in: Accommodate new file. * setup.c (xsystem): Move to new file. (recurse_dirs): Accept handle to output log file. Don't use ">" redirection to trap tar output. Use supplied handle instead. diff --git a/src/setup/ControlAdjuster.h b/src/setup/ControlAdjuster.h index dab8b011..c0043241 100644 --- a/src/setup/ControlAdjuster.h +++ b/src/setup/ControlAdjuster.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, Frank Richter - * Copyrught (c) 2003, Robert Collins + * Copyright (c) 2003, Robert Collins * * 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/setup/Generic.h b/src/setup/Generic.h index 7406b7fe..a894e1d2 100644 --- a/src/setup/Generic.h +++ b/src/setup/Generic.h @@ -16,7 +16,7 @@ #ifndef SETUP_GENERIC_H #define SETUP_GENERIC_H -/* Todo fully paramterise */ +/* Todo fully parameterise */ template struct _visit_if { _visit_if(_Visitor v, _Predicate p) : visitor(v), predicate (p) {} diff --git a/src/setup/IniDBBuilderPackage.cc b/src/setup/IniDBBuilderPackage.cc index b7611001..fd0abae0 100644 --- a/src/setup/IniDBBuilderPackage.cc +++ b/src/setup/IniDBBuilderPackage.cc @@ -274,7 +274,7 @@ void IniDBBuilderPackage::buildMaintainer (const std::string& ){} /* TODO: we can multiple arch's for a given package, - and it may befor either source or binary, so we need to either set both + and it may before either source or binary, so we need to either set both or track a third current package that points to whether we altering source or binary at the moment */ diff --git a/src/setup/LogSingleton.h b/src/setup/LogSingleton.h index b59b9181..af986964 100644 --- a/src/setup/LogSingleton.h +++ b/src/setup/LogSingleton.h @@ -52,7 +52,7 @@ class LogSingleton : public std::ostream friend std::ostream& endLog(std::ostream& outs); protected: - LogSingleton(std::streambuf* aStream); // Only child classs can be created. + LogSingleton(std::streambuf* aStream); // Only child class can be created. LogSingleton (LogSingleton const &); // no copy constructor LogSingleton &operator = (LogSingleton const&); // no assignment operator virtual void endEntry() = 0; // the current in-progress entry is complete. diff --git a/src/setup/PickView.cc b/src/setup/PickView.cc index f2cf862b..49d74274 100644 --- a/src/setup/PickView.cc +++ b/src/setup/PickView.cc @@ -445,14 +445,14 @@ PickView::init_headers (HDC dc) headers[i].x = 0; } - // accomodate widths of the 'bin' and 'src' checkbox columns + // accommodate widths of the 'bin' and 'src' checkbox columns // FIXME: What's up with the "0"? It's probably a mistake, and should be // "". It used to be written as 0, and was subject to a bizarre implicit // conversion by the unwise String(int) constructor. note_width (headers, dc, "0", HMARGIN + 11, bintick_col); note_width (headers, dc, "0", HMARGIN + 11, srctick_col); - // accomodate the width of each category name + // accommodate the width of each category name packagedb db; for (packagedb::categoriesType::iterator n = packagedb::categories.begin(); n != packagedb::categories.end(); ++n) @@ -462,7 +462,7 @@ PickView::init_headers (HDC dc) note_width (headers, dc, n->first, HMARGIN, cat_col); } - /* For each package, accomodate the width of the installed version in the + /* For each package, accommodate the width of the installed version in the current_col, the widths of all other versions in the new_col, and the width of the sdesc for the pkg_col. Also, if this is not a Category view, adjust the 'category' column so that the first NUM_CATEGORY_COL_WIDTH @@ -796,7 +796,7 @@ PickView::WindowProc (UINT message, WPARAM wParam, LPARAM lParam) // this is how many 'notches' the wheel scrolled, forward/up = positive wheel_notches = GET_WHEEL_DELTA_WPARAM(wParam) / 120; - // determine how many lines the user has configred for a mouse scroll + // determine how many lines the user has configured for a mouse scroll SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &wheel_lines, 0); if (wheel_lines == 0) // do no scrolling diff --git a/src/setup/RECTWrapper.h b/src/setup/RECTWrapper.h index 3d1c8ab3..7a56f9f7 100644 --- a/src/setup/RECTWrapper.h +++ b/src/setup/RECTWrapper.h @@ -23,7 +23,7 @@ Thin wrapper around GDI's RECT, mainly to allow what would otherwise have to be a ton of "OffsetRect(&rect, 1, 2);"-type calls to be more easily written. Also has a few gimmes like width() and height(). Note this is derived from -GDI's RECT *struct*, so that they're interchangable, and is not a class proper. +GDI's RECT *struct*, so that they're interchangeable, and is not a class proper. Not a general-purpose Rectangle class, not intended to be a general-purpose Rectangle class. DO NOT add virtual members or you'll wreck the RECT==RECTWrapper duality. diff --git a/src/setup/ScanFindVisitor.cc b/src/setup/ScanFindVisitor.cc index 50e74159..32b97a9c 100644 --- a/src/setup/ScanFindVisitor.cc +++ b/src/setup/ScanFindVisitor.cc @@ -39,7 +39,7 @@ ScanFindVisitor::visitFile(const std::string& basePath, // Build a new package called f.pkg _Builder.buildPackage (f.pkg); - // Set the version we are bulding + // Set the version we are building _Builder.buildPackageVersion (f.ver); // Add the file as a installable package diff --git a/src/setup/archive.h b/src/setup/archive.h index 048580ea..2e1a1d33 100644 --- a/src/setup/archive.h +++ b/src/setup/archive.h @@ -49,7 +49,7 @@ class archive:public io_stream }; /* get an archive child class from an io_stream */ static archive *extract (io_stream *); - /* get an ouput stream for the next files from the archive. + /* get an output stream for the next files from the archive. * returns NULL on failure. * The stream is not taken over - it will not be automatically deleted */ diff --git a/src/setup/compress.cc b/src/setup/compress.cc index 595cbb3c..4a9959cf 100644 --- a/src/setup/compress.cc +++ b/src/setup/compress.cc @@ -21,7 +21,7 @@ /* In case you are wondering why the file magic is not in one place: * It could be. But there is little (any?) benefit. * What is important is that the file magic required for any _task_ is centralised. - * One such task is identifying compresss + * One such task is identifying compress * * to federate into each class one might add a magic parameter to the constructor, which * the class could test itself. diff --git a/src/setup/compress_bz.h b/src/setup/compress_bz.h index 2d319e87..35775426 100644 --- a/src/setup/compress_bz.h +++ b/src/setup/compress_bz.h @@ -44,7 +44,7 @@ class compress_bz:public compress */ virtual const char *next_file_name () { return NULL; } virtual int set_mtime (time_t); - /* Use seek EOF, then tell (). get_size won't do this incase you are sucking dow + /* Use seek EOF, then tell (). get_size won't do this in case you are sucking down * over a WAN :} */ virtual size_t get_size () {return 0;} virtual time_t get_mtime (); diff --git a/src/setup/compress_gz.cc b/src/setup/compress_gz.cc index b1dc7cab..333c0dc3 100644 --- a/src/setup/compress_gz.cc +++ b/src/setup/compress_gz.cc @@ -534,7 +534,7 @@ gzclose (lst); /* =========================================================================== * Read a byte from a gz_stream; update next_in and avail_in. Return EOF * for end of file. - * IN assertion: the stream s has been sucessfully opened for reading. + * IN assertion: the stream s has been successfully opened for reading. */ int compress_gz::get_byte () @@ -564,7 +564,7 @@ compress_gz::get_byte () mode to transparent if the gzip magic header is not present; set s->err to Z_DATA_ERROR if the magic header is present but the rest of the header is incorrect. - IN assertion: the stream s has already been created sucessfully; + IN assertion: the stream s has already been created successfully; s->stream.avail_in is zero for the first time, but may be non-zero for concatenated .gz files. */ diff --git a/src/setup/compress_gz.h b/src/setup/compress_gz.h index f8c6142e..d41427b9 100644 --- a/src/setup/compress_gz.h +++ b/src/setup/compress_gz.h @@ -51,7 +51,7 @@ class compress_gz:public compress }; virtual int set_mtime (time_t); virtual time_t get_mtime (); - /* Use seek EOF, then tell (). get_size won't do this incase you are sucking down + /* Use seek EOF, then tell (). get_size won't do this in case you are sucking down * over a WAN :} */ virtual size_t get_size () {return 0;}; virtual void release_original (); /* give up ownership of original io_stream */ diff --git a/src/setup/csu_util/version_compare.cc b/src/setup/csu_util/version_compare.cc index 2cbe99f4..9d0a4e83 100644 --- a/src/setup/csu_util/version_compare.cc +++ b/src/setup/csu_util/version_compare.cc @@ -18,7 +18,7 @@ using namespace std; static inline bool isdigit(char c) { return (c >= '0' && c <= '9'); } -/* Sort two version numbers, comparing equivalently seperated strings of +/* Sort two version numbers, comparing equivalently separated strings of * digits numerically. * * Returns a positive number if (a > b) diff --git a/src/setup/csu_util/version_compare.h b/src/setup/csu_util/version_compare.h index cbfe2a64..5e285f58 100644 --- a/src/setup/csu_util/version_compare.h +++ b/src/setup/csu_util/version_compare.h @@ -17,7 +17,7 @@ #include -/* Sort two version numbers, comparing equivalently seperated strings of +/* Sort two version numbers, comparing equivalently separated strings of * digits numerically. * * Returns a positive number if (a > b) diff --git a/src/setup/cygpackage.h b/src/setup/cygpackage.h index c9a509bc..b3702251 100644 --- a/src/setup/cygpackage.h +++ b/src/setup/cygpackage.h @@ -17,7 +17,7 @@ #define SETUP_CYGPACKAGE_H /* This is a cygwin specific package class, that should be able to - * arbitrate acceess to cygwin binary packages amd cygwin source packages + * arbitrate access to cygwin binary packages amd cygwin source packages */ /* for MAX_PATH */ diff --git a/src/setup/ini.cc b/src/setup/ini.cc index a605aa94..1c5c7a6e 100644 --- a/src/setup/ini.cc +++ b/src/setup/ini.cc @@ -159,7 +159,7 @@ do_remote_ini (HWND owner) bz2 streams, so when it comes time to write out a local cached copy of the .ini file below, we'd otherwise have to delete this stream and uncompress it again from the start, which is wasteful. - The current uncompresed size of the .ini file as of 2007 is less + The current uncompressed size of the .ini file as of 2007 is less than 600 kB, so this is not a great deal of memory. */ io_stream *bz2_stream = compress::decompress (ini_file); if (!bz2_stream) diff --git a/src/setup/io_stream.cc b/src/setup/io_stream.cc index a169a04f..de575697 100644 --- a/src/setup/io_stream.cc +++ b/src/setup/io_stream.cc @@ -13,7 +13,7 @@ * */ -/* this is the parent class for all IO operations. It's flexable enough to be cover for +/* this is the parent class for all IO operations. It's flexible enough to be cover for * HTTP access, local file access, and files being extracted from archives. * It also encapsulates the idea of an archive, and all non-archives become the special * case. diff --git a/src/setup/io_stream.h b/src/setup/io_stream.h index 5b311063..7ec92a59 100644 --- a/src/setup/io_stream.h +++ b/src/setup/io_stream.h @@ -21,7 +21,7 @@ typedef SSIZE_T ssize_t; #endif -/* this is the parent class for all IO operations. It's flexable enough to be cover for +/* this is the parent class for all IO operations. It's flexible enough to be cover for * HTTP access, local file access, and files being extracted from archives. * It also encapsulates the idea of an archive, and all non-archives become the special * case. diff --git a/src/setup/libgetopt++/tests/BoolOptionTest.cc b/src/setup/libgetopt++/tests/BoolOptionTest.cc index 7fdd2591..9f64f487 100644 --- a/src/setup/libgetopt++/tests/BoolOptionTest.cc +++ b/src/setup/libgetopt++/tests/BoolOptionTest.cc @@ -39,7 +39,7 @@ main (int anargc, char **anargv) } if (!helpoption) { - std::cout << "Did not recieve expected help option" << std::endl; + std::cout << "Did not receive expected help option" << std::endl; return 1; } free(argv[1]); diff --git a/src/setup/main.cc b/src/setup/main.cc index 77923a4f..8d76a2da 100644 --- a/src/setup/main.cc +++ b/src/setup/main.cc @@ -215,7 +215,7 @@ main_display (void) // Create the PropSheet main window MainWindow.Create (); - // Uninitalize COM + // Uninitialize COM if (sl) sl->Release (); CoUninitialize (); diff --git a/src/setup/netio.cc b/src/setup/netio.cc index 2887f300..1ac9b937 100644 --- a/src/setup/netio.cc +++ b/src/setup/netio.cc @@ -45,7 +45,7 @@ char *NetIO::net_ftp_user; char *NetIO::net_ftp_passwd; NetIO * -NetIO::open (char const *url, bool cachable) +NetIO::open (char const *url, bool cacheable) { NetIO *rv = 0; std::string file_url; @@ -84,7 +84,7 @@ NetIO::open (char const *url, bool cachable) url = file_url.c_str(); } - rv = new NetIO_IE5 (url, proto == file ? false : cachable); + rv = new NetIO_IE5 (url, proto == file ? false : cacheable); if (rv && !rv->ok ()) { diff --git a/src/setup/netio.h b/src/setup/netio.h index 2e78ccfa..9da7d0d9 100644 --- a/src/setup/netio.h +++ b/src/setup/netio.h @@ -48,7 +48,7 @@ class NetIO the given URL. It uses the network setup state in state.h. If anything fails, either the return values is NULL or the returned object is !ok() */ - static NetIO *open (char const *url, bool cachable); + static NetIO *open (char const *url, bool cacheable); /* If !ok() that means the transfer isn't happening. */ virtual int ok () = 0; diff --git a/src/setup/nio-ie5.cc b/src/setup/nio-ie5.cc index cadf0d75..6b0fa21c 100644 --- a/src/setup/nio-ie5.cc +++ b/src/setup/nio-ie5.cc @@ -137,7 +137,7 @@ DWORD Proxy::type (void) const static HINTERNET internet = 0; static Proxy last_proxy = Proxy(-1, "", -1); -NetIO_IE5::NetIO_IE5 (char const *url, bool cachable) +NetIO_IE5::NetIO_IE5 (char const *url, bool cacheable) { int resend = 0; @@ -177,7 +177,7 @@ NetIO_IE5::NetIO_IE5 (char const *url, bool cachable) INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_EXISTING_CONNECT | INTERNET_FLAG_PASSIVE; - if (!cachable) { + if (!cacheable) { flags |= INTERNET_FLAG_NO_CACHE_WRITE; } else { flags |= INTERNET_FLAG_RESYNCHRONIZE; diff --git a/src/setup/package_db.cc b/src/setup/package_db.cc index 2672bf6c..7fe4f04d 100644 --- a/src/setup/package_db.cc +++ b/src/setup/package_db.cc @@ -302,7 +302,7 @@ ConnectedLoopFinder::visit(packagemeta *nodeToVisit) /* we found an installed ok package */ /* visit it if needed */ /* UGLY. Need to refactor. iterators in the outer would help as we could simply - * vist the iterator + * visit the iterator */ const packagedb::packagecollection::iterator n = db.packages.find((*i)->packageName()); diff --git a/src/setup/package_db.h b/src/setup/package_db.h index b7d275d6..4340e75a 100644 --- a/src/setup/package_db.h +++ b/src/setup/package_db.h @@ -33,7 +33,7 @@ typedef enum { class packagedb; typedef std::vector ::iterator PackageDBConnectedIterator; -/*TODO: add mutexs */ +/*TODO: add mutexes */ /*TODO: add sanity. Beware, Here Be C++ Dragons: diff --git a/src/setup/package_meta.cc b/src/setup/package_meta.cc index bd90a54e..d8ca732d 100644 --- a/src/setup/package_meta.cc +++ b/src/setup/package_meta.cc @@ -772,7 +772,7 @@ packagemeta::ScanDownloadedFiles () ++i; } } - /* Don't explicity iterate through sources - any sources that aren't + /* Don't explicitly iterate through sources - any sources that aren't referenced are unselectable anyway. */ } diff --git a/src/setup/package_version.cc b/src/setup/package_version.cc index 1bd081ba..d80e3c21 100644 --- a/src/setup/package_version.cc +++ b/src/setup/package_version.cc @@ -57,7 +57,7 @@ class _defaultversion : public _packageversion void set_autodep (const std::string& ) {} void set_license (const std::string& ) {} void uninstall (){} - void pick(bool const &newValue){/* Ignore attempts to pick this!. Throw an exception here if you want to detect such attemtps instead */} + void pick(bool const &newValue){/* Ignore attempts to pick this!. Throw an exception here if you want to detect such attempts instead */} virtual void addScript(Script const &) {} virtual std::vector