src: move console files into a subdir; NFC

.github/workflows/ci.yml

@@ -293,7 +293,7 @@ jobs:
           set s=%H%\src
           cat .GITREV.txt
           set /p GITREV=<.GITREV.txt
-          set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\filter\*.cpp %s%\util\*.cpp
+          set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\console\*.cpp %s%\filter\*.cpp %s%\util\*.cpp
           cl -std:c++17 -Zc:__cplusplus -EHsc -J -O2 -W4 -WX -DUPX_VERSION_GITREV="""%GITREV%""" -DWITH_ZSTD %DEFS% -I%H%\vendor -I%H%\vendor\boost-pfr\include -Feupx.exe %sources% %BDIR%\ucl\ucl.lib %BDIR%\zlib\zlib.lib %BDIR%\zstd\zstd.lib /link setargv.obj
       - name: 'Make artifact'
         shell: bash

src/conf.h

@@ -781,7 +781,7 @@ struct upx_compress_result_t
 #include "options.h"
 #include "except.h"
 #include "bele.h"
-#include "console.h"
+#include "console/console.h"
 #include "util/util.h"
 
 // classes

src/console/c_file.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_CONSOLE)
 

src/console/c_init.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 FILE *con_term = nullptr;
 

src/console/c_none.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_CONSOLE)
 

src/console/c_screen.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN)
 

src/console/console.h

@@ -25,6 +25,8 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
+#pragma once
+
 /*************************************************************************
 //
 **************************************************************************/

src/console/s_djgpp2.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN) && (ACC_OS_DOS32) && defined(__DJGPP__)
 #if (ACC_CC_GNUC >= 0x040300ul)

src/console/s_object.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN)
 

src/console/s_vcsa.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN) && (USE_SCREEN_VCSA)
 

src/console/s_win32.cpp

@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN_WIN32)
 

src/console/screen.h

@@ -25,8 +25,9 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#ifndef __UPX_SCREEN_H
+#pragma once
-#define __UPX_SCREEN_H 1
+#ifndef UPX_SCREEN_H__
+#define UPX_SCREEN_H__ 1
 
 #if (USE_SCREEN)
 

src/ui.cpp

@@ -27,9 +27,9 @@
 
 #include "conf.h"
 #include "file.h"
-#include "ui.h"
-#include "screen.h"
 #include "packer.h"
+#include "ui.h"
+#include "console/screen.h"
 
 #if 1 && (USE_SCREEN)
 #define UI_USE_SCREEN 1

src/ui.h

@@ -26,13 +26,11 @@
  */
 
 #pragma once
-#ifndef __UPX_UI_H
+#ifndef UPX_UI_H__
-#define __UPX_UI_H 1
+#define UPX_UI_H__ 1
 
-class InputFile;
 class OutputFile;
 class Packer;
-class UiPacker;
 
 /*************************************************************************
 //