More patching (#5965)

Author: stamparm

data/txt/sha256sums.txt

@@ -189,7 +189,7 @@ c4bfb493a03caf84dd362aec7c248097841de804b7413d0e1ecb8a90c8550bc0  lib/core/readl
 d1bd70c1a55858495c727fbec91e30af267459c8f64d50fabf9e4ee2c007e920  lib/core/replication.py
 1d0f80b0193ac5204527bfab4bde1a7aee0f693fd008e86b4b29f606d1ef94f3  lib/core/revision.py
 d2eb8e4b05ac93551272b3d4abfaf5b9f2d3ac92499a7704c16ed0b4f200db38  lib/core/session.py
-a5953548484b3f8fc1a1afd30f8a1ba46ceee4238f3d59509f0f0af369abb543  lib/core/settings.py
+17d2ef081f4e0820b2123e0a213dc44a7a081fa18da9b0b4edf1991c13c3a82d  lib/core/settings.py
 1c5eab9494eb969bc9ce118a2ea6954690c6851cbe54c18373c723b99734bf09  lib/core/shell.py
 4eea6dcf023e41e3c64b210cb5c2efc7ca893b727f5e49d9c924f076bb224053  lib/core/subprocessng.py
 cdd352e1331c6b535e780f6edea79465cb55af53aa2114dcea0e8bf382e56d1a  lib/core/target.py
@@ -261,7 +261,7 @@ c0e6e33d2aa115e7ab2459e099cbaeb282065ea158943efc2ff69ba771f03210  lib/utils/sear
 8258d0f54ad94e6101934971af4e55d5540f217c40ddcc594e2fba837b856d35  lib/utils/sgmllib.py
 61dfd44fb0a5a308ba225092cb2768491ea2393999683545b7a9c4f190001ab8  lib/utils/sqlalchemy.py
 6f5f4b921f8cfe625e4656ee4560bc7d699d1aebf6225e9a8f5cf969d0fa7896  lib/utils/timeout.py
-5ad017569d4cfbd0ec4971537e9bb81ad8ee008029422104932afceaed0fec57  lib/utils/tui.py
+9967e8af7db75fa662a3934e3f4e6fb03f56448a6f96d7fb3761bca7a0f917a5  lib/utils/tui.py
 9cb6bd014598515a95945f03861e7484d6c0f9f4b508219eb5cc0c372ed5c173  lib/utils/versioncheck.py
 bd4975ff9cbc0745d341e6c884e6a11b07b0a414105cc899e950686d2c1f88ba  lib/utils/xrange.py
 33049ba7ddaea4a8a83346b3be29d5afce52bbe0b9d8640072d45cadc0e6d4bb  LICENSE

lib/core/settings.py

@@ -19,7 +19,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.9.12.59"
+VERSION = "1.9.12.60"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/utils/tui.py

@@ -224,7 +224,8 @@ def _draw_current_tab(self):
             # Draw value
             value_str = ""
             if option['type'] == 'bool':
-                value_str = "[X]" if option['value'] else "[ ]"
+                value = option['value'] if option['value'] is not None else option.get('default')
+                value_str = "[X]" if value else "[ ]"
             else:
                 value_str = str(option['value']) if option['value'] else ""
                 if option['default'] and not option['value']:
@@ -367,7 +368,7 @@ def _export_config(self):
                 for tab in self.tabs:
                     for option in tab['options']:
                         dest = option['dest']
-                        value = option['value'] if option['value'] else option.get('default')
+                        value = option['value'] if option['value'] is not None else option.get('default')
 
                         if option['type'] == 'bool':
                             config[dest] = bool(value)
@@ -526,7 +527,7 @@ def _run_sqlmap(self):
         for tab in self.tabs:
             for option in tab['options']:
                 dest = option['dest']
-                value = option['value'] if option['value'] else option.get('default')
+                value = option['value'] if option['value'] is not None else option.get('default')
 
                 if option['type'] == 'bool':
                     config[dest] = bool(value)
@@ -580,10 +581,11 @@ def _show_console(self, configFile):
                 close_fds=not IS_WIN
             )
 
-            # Make it non-blocking
-            import fcntl
-            flags = fcntl.fcntl(process.stdout, fcntl.F_GETFL)
-            fcntl.fcntl(process.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK)
+            if not IS_WIN:
+                # Make it non-blocking
+                import fcntl
+                flags = fcntl.fcntl(process.stdout, fcntl.F_GETFL)
+                fcntl.fcntl(process.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK)
 
             output_win.nodelay(True)
             console_win.nodelay(True)