Changeset 1210

Timestamp:

14/12/2006 23:20:36 (5 years ago)

Author:

chris

Message:

• Convert command-line arguments from the system locale/character set to the console character set (code page), so they they can be converted from console to UTF-8 (yuck).

• Don't try to read from stdin or change its code page when it's not open (invalid file handle)

(merges [1050]+[1051])

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (6 diffs)
• BackupQueries.h (modified) (2 diffs)
• bbackupquery.cpp (modified) (4 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -103 +103 @@
 //
 // Function
-//              Name:    BackupQueries::DoCommand(const char *)
+//              Name:    BackupQueries::DoCommand(const char *, bool)
 //              Purpose: Perform a command
 //              Created: 2003/10/10
 //
 // --------------------------------------------------------------------------
-void BackupQueries::DoCommand(const char *Command)
+void BackupQueries::DoCommand(const char *Command, bool isFromCommandLine)
 {
         // is the command a shell command?
@@ -169 +169 @@
         }
         
+        #ifdef WIN32
+        if (isFromCommandLine)
+        {
+                for (std::vector<std::string>::iterator 
+                        i  = cmdElements.begin();
+                        i != cmdElements.end(); i++)
+                {
+                        std::string converted;
+                        if (!ConvertEncoding(*i, CP_ACP, converted, 
+                                GetConsoleCP()))
+                        {
+                                printf("Failed to convert encoding");
+                                return;
+                        }
+                        *i = converted;
+                }
+        }
+        #endif
+                
         // Check...
         if(cmdElements.size() < 1)
@@ -395 +414 @@
 //
 // Function
-//              Name:    BackupQueries::List(int64_t, const std::string &, const bool *)
+//              Name:    BackupQueries::List(int64_t, const std::string &, const bool *, bool)
 //              Purpose: Do the actual listing of directories and files
 //              Created: 2003/10/10
@@ -872 +891 @@
 //
 // --------------------------------------------------------------------------
-void BackupQueries::CommandGet(const std::vector<std::string> &args, const bool *opts)
+void BackupQueries::CommandGet(std::vector<std::string> args, const bool *opts)
 {
         // At least one argument?
@@ -889 +908 @@
         // BLOCK
         {
+#ifdef WIN32
+                for (std::vector<std::string>::iterator 
+                        i = args.begin(); i != args.end(); i++)
+                {
+                        std::string out;
+                        if(!ConvertConsoleToUtf8(i->c_str(), out))
+                        {
+                                fprintf(stderr, "failed to convert encoding\n");
+                                return;
+                        }
+                        *i = out;
+                }
+#endif
+
+                std::string fileName(args[0]);
+
+                if(!opts['i'])
+                {
+                        // does this remote filename include a path?
+                        std::string::size_type index = fileName.rfind('/');
+                        if(index != std::string::npos)
+                        {
+                                std::string dirName(fileName.substr(0, index));
+                                fileName = fileName.substr(index + 1);
+
+                                dirId = FindDirectoryObjectID(dirName);
+                                if(dirId == 0)
+                                {
+                                        printf("Directory '%s' not found\n", 
+                                                dirName.c_str());
+                                        return;
+                                }
+                        }
+                }
+
+                BackupStoreFilenameClear fn(fileName);
+
                 // Need to look it up in the current directory
                 mrConnection.QueryListDirectory(
@@ -925 +981 @@
                         // Specified by name, find the object in the directory to get the ID
                         BackupStoreDirectory::Iterator i(dir);
-#ifdef WIN32
-                        std::string fileName;
-                        if(!ConvertConsoleToUtf8(args[0].c_str(), fileName))
-                                return;
-                        BackupStoreFilenameClear fn(fileName);
-#else
-                        BackupStoreFilenameClear fn(args[0]);
-#endif
                         BackupStoreDirectory::Entry *en = i.FindMatchingClearName(fn);
                         

box/trunk/bin/bbackupquery/BackupQueries.h

@@ -37 +37 @@
 public:
 
-        void DoCommand(const char *Command);
+        void DoCommand(const char *Command, bool isFromCommandLine);
 
         // Ready to stop?
@@ -51 +51 @@
         void CommandChangeLocalDir(const std::vector<std::string> &args);
         void CommandGetObject(const std::vector<std::string> &args, const bool *opts);
-        void CommandGet(const std::vector<std::string> &args, const bool *opts);
+        void CommandGet(std::vector<std::string> args, const bool *opts);
         void CommandCompare(const std::vector<std::string> &args, const bool *opts);
         void CommandRestore(const std::vector<std::string> &args, const bool *opts);

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -172 +172 @@
 
                 // enable input of Unicode characters
-                if (_setmode(_fileno(stdin), _O_TEXT) == -1)
+                if (_fileno(stdin) != -1 &&
+                        _setmode(_fileno(stdin), _O_TEXT) == -1)
                 {
                         perror("Failed to set the console input to "
@@ -246 +247 @@
                 while(c < argc && !context.Stop())
                 {
-                        context.DoCommand(argv[c++]);
+                        context.DoCommand(argv[c++], true);
                 }
         }
@@ -264 +265 @@
                         break;
                 }
-                context.DoCommand(command);
+                context.DoCommand(command, false);
                 if(last_cmd != 0 && ::strcmp(last_cmd, command) == 0)
                 {
@@ -285 +286 @@
 #else
         // Version for platforms which don't have readline by default
-        FdGetLine getLine(fileno(stdin));
-        while(!context.Stop())
-        {
-                printf("query > ");
-                fflush(stdout);
-                std::string command(getLine.GetLine());
-                context.DoCommand(command.c_str());
+        if(fileno(stdin) >= 0)
+        {
+                FdGetLine getLine(fileno(stdin));
+                while(!context.Stop())
+                {
+                        printf("query > ");
+                        fflush(stdout);
+                        std::string command(getLine.GetLine());
+                        context.DoCommand(command.c_str(), false);
+                }
         }
 #endif