Diff:
---
Feedback.h | 1 -
cli/CliFeedback.h | 1 -
cli/CliParseFeedback.cc | 5 -----
desktop.cc | 8 --------
find.cc | 13 +++++++++++--
fromcwd.cc | 10 +++++-----
gui/GuiFeedback.h | 1 -
gui/GuiParseFeedback.cc | 6 ------
ini.cc | 5 ++++-
mount.cc | 32 --------------------------------
10 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/Feedback.h b/Feedback.h
index 4db7c4a1..663600a4 100644
--- a/Feedback.h
+++ b/Feedback.h
@@ -31,7 +31,6 @@ public:
virtual void parse_finish () = 0;
virtual void progress (unsigned long const, unsigned long const) = 0;
virtual void iniName (const std::string& ) = 0;
- virtual void babble (const std::string& ) const = 0;
virtual void warning (const std::string& ) const = 0;
virtual void show_errors () const = 0;
virtual void note_error(int lineno, const std::string &error) = 0;
diff --git a/cli/CliFeedback.h b/cli/CliFeedback.h
index cb596503..1fd72244 100644
--- a/cli/CliFeedback.h
+++ b/cli/CliFeedback.h
@@ -21,7 +21,6 @@ public:
virtual void parse_finish ();
virtual void progress (unsigned long const pos, unsigned long const max);
virtual void iniName (const std::string& name);
- virtual void babble (const std::string& message) const;
virtual void warning (const std::string& message) const;
virtual void show_errors () const;
virtual void note_error(int lineno, const std::string &s);
diff --git a/cli/CliParseFeedback.cc b/cli/CliParseFeedback.cc
index a58ee5a6..3bfabae4 100644
--- a/cli/CliParseFeedback.cc
+++ b/cli/CliParseFeedback.cc
@@ -35,11 +35,6 @@ void CliFeedback::iniName (const std::string& name)
{
}
-void CliFeedback::babble (const std::string& message) const
-{
- Log (LOG_BABBLE) << message << endLog;
-}
-
void CliFeedback::warning (const std::string& message) const
{
std::cout << "Warning: " << message << std::endl;
diff --git a/desktop.cc b/desktop.cc
index c9efc2a8..bc983a34 100644
--- a/desktop.cc
+++ b/desktop.cc
@@ -44,14 +44,6 @@ BoolOption NoShortcutsOption (false, 'n', "no-shortcuts",
IDS_HELPTEXT_NO_SHORTC
BoolOption NoStartMenuOption (false, 'N', "no-startmenu",
IDS_HELPTEXT_NO_STARTMENU);
static BoolOption NoDesktopOption (false, 'd', "no-desktop",
IDS_HELPTEXT_NO_DESKTOP);
-/* Lines starting with '@' are conditionals - include 'N' for NT,
- '5' for Win95, '8' for Win98, '*' for all, like this:
- echo foo
- @N8
- echo NT or 98
- @*
- */
-
static ControlAdjuster::ControlInfo DesktopControlsInfo[] = {
{IDC_DESKTOP_SEPARATOR, CP_STRETCH, CP_BOTTOM},
{IDC_STATUS, CP_LEFT, CP_BOTTOM},
diff --git a/find.cc b/find.cc
index 9d4f6278..bf0c607d 100644
--- a/find.cc
+++ b/find.cc
@@ -14,8 +14,16 @@
*
*/
-/* The purpose of this file is to doa recursive find on a given
- directory, calling a given function for each file found. */
+/* The purpose of this file is to do a (recursive) find on a given directory,
+ calling a given function for each file and directory found.
+
+ accept() calls the visitDirectory() method of the FindVisitor object
supplied
+ for each directory found. It also calls the visitFile() method for each file
+ found.
+
+ The default FindVisitor::visitDirectory() implementation simply decrements
+ the level, and recurses if it's greater than zero.
+*/
#include "win32.h"
#include "filemanip.h"
@@ -68,6 +76,7 @@ Find::accept (FindVisitor &aVisitor, int level)
do
{
+ /* Ignore '.' and '..' entries */
if (wcscmp (w_wfd.cFileName, L".") == 0
|| wcscmp (w_wfd.cFileName, L"..") == 0)
continue;
diff --git a/fromcwd.cc b/fromcwd.cc
index 8cc50057..0d4e02f5 100644
--- a/fromcwd.cc
+++ b/fromcwd.cc
@@ -29,9 +29,8 @@
#include "String++.h"
#include "find.h"
#include "ini.h"
-
#include "FindVisitor.h"
-#include "IniDBBuilderPackage.h"
+#include "LogSingleton.h"
class SetupFindVisitor : public FindVisitor
{
@@ -74,9 +73,10 @@ public:
{
if (*fi)
{
- found_ini_list.push_back (basePath + SetupArch() + "/"
- + SetupBaseName() + "." + *ext);
- /*
+ std::string fn = basePath + SetupArch() + "/" +
SetupBaseName() + "." + *ext;
+ Log (LOG_BABBLE) << "Found ini file: " << fn << endLog;
+ found_ini_list.push_back (fn);
+ /*
* Terminate the search after the first setup file
* found, which shadows any setup files with
* extensions later in the preference order in the
diff --git a/gui/GuiFeedback.h b/gui/GuiFeedback.h
index 7ac0c806..0d8294ea 100644
--- a/gui/GuiFeedback.h
+++ b/gui/GuiFeedback.h
@@ -25,7 +25,6 @@ public:
void parse_finish ();
void progress (unsigned long const, unsigned long const);
void iniName (const std::string& );
- void babble (const std::string& ) const;
void warning (const std::string& ) const;
void show_errors () const;
void note_error(int lineno, const std::string &error);
diff --git a/gui/GuiParseFeedback.cc b/gui/GuiParseFeedback.cc
index 9873aa78..8e67a2fd 100644
--- a/gui/GuiParseFeedback.cc
+++ b/gui/GuiParseFeedback.cc
@@ -76,12 +76,6 @@ GuiFeedback::iniName (const std::string& name)
filename = name;
}
-void
-GuiFeedback::babble (const std::string& message)const
-{
- Log (LOG_BABBLE) << message << endLog;
-}
-
void
GuiFeedback::warning (const std::string& message)const
{
diff --git a/ini.cc b/ini.cc
index ebacbd05..2d9317c9 100644
--- a/ini.cc
+++ b/ini.cc
@@ -188,7 +188,7 @@ do_local_ini (Feedback &myFeedback)
else
{
// grok information from setup
- myFeedback.babble ("Found ini file - " + current_ini_name);
+ myFeedback.parse_init();
myFeedback.iniName (current_ini_name);
int ldl = local_dir.length () + 1;
int cap = current_ini_name.rfind ("/" + SetupArch());
@@ -209,6 +209,7 @@ do_local_ini (Feedback &myFeedback)
}
delete ini_file;
ini_file = NULL;
+ myFeedback.parse_finish();
}
}
return ini_error;
@@ -256,6 +257,7 @@ do_remote_ini (Feedback &myFeedback)
else
{
// grok information from setup
+ myFeedback.parse_init();
myFeedback.iniName (current_ini_name);
aBuilder.parse_mirror = n->url;
ini_init (ini_file, &aBuilder, myFeedback);
@@ -287,6 +289,7 @@ do_remote_ini (Feedback &myFeedback)
}
delete ini_file;
ini_file = NULL;
+ myFeedback.parse_finish();
}
}
diff --git a/mount.cc b/mount.cc
index 0d15c713..e1ed6d7c 100644
--- a/mount.cc
+++ b/mount.cc
@@ -27,41 +27,9 @@
#include <stdlib.h>
#include <malloc.h>
-// These headers aren't available outside the winsup tree
-// #include "../cygwin/include/cygwin/version.h"
-// KEEP SYNCHRONISED WITH /src/winsup/cygwin/include/cygwin/version.h
-
#define CYGWIN_INFO_CYGWIN_REGISTRY_NAME "Cygwin"
#define CYGWIN_INFO_CYGWIN_SETUP_REGISTRY_NAME "setup"
-// #include "../cygwin/include/sys/mount.h"
-
-// KEEP SYNCHRONISED WITH /src/winsup/cygwin/include/sys/mount.h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum
-{
- MOUNT_SYMLINK = 0x001, /* "mount point" is a symlink */
- MOUNT_BINARY = 0x002, /* "binary" format read/writes */
- MOUNT_SYSTEM = 0x008, /* mount point came from system table */
- MOUNT_EXEC = 0x010, /* Any file in the mounted directory gets 'x'
bit */
- MOUNT_AUTO = 0x020, /* mount point refers to auto device mount */
- MOUNT_CYGWIN_EXEC = 0x040, /* file or directory is or contains a cygwin
executable */
- MOUNT_MIXED = 0x080, /* reads are text, writes are binary */
-};
-
-// int mount (const char *, const char *, unsigned __flags);
-// int umount (const char *);
-// int cygwin_umount (const char *__path, unsigned __flags);
-
-#ifdef __cplusplus
-};
-#endif
-
-
-
#include "mount.h"
#include "msg.h"
#include "resource.h"
[setup - the official Cygwin setup program] branch master, updated. release_2.937
Jon Turney via Cygwin-apps-cvs Sat, 28 Feb 2026 09:35:09 -0800
