From bcb6aa9fa9ddf78c503c971b96147cb345aa6a38 Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sf.net>
Date: Mon, 25 Jun 2018 01:24:31 +0100
Subject: [PATCH] dtfile: Remove define MULTIBYTE which is always on for CDE

---
 cde/programs/dtfile/Directory.c |  4 ----
 cde/programs/dtfile/File.c      | 17 -----------------
 cde/programs/dtfile/Imakefile   |  2 +-
 cde/programs/dtfile/Main.c      | 12 ------------
 4 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/cde/programs/dtfile/Directory.c b/cde/programs/dtfile/Directory.c
index 1351ba4c..2f9fbb6c 100644
--- a/cde/programs/dtfile/Directory.c
+++ b/cde/programs/dtfile/Directory.c
@@ -3612,10 +3612,8 @@ GetLongName(
    {
 #define ELLIPSIS " (...) "
 #define NAME_PRECISION 28
-#ifdef MULTIBYTE
      if (! is_multibyte)
      {
-#endif
        int len = strlen( file_data->file_name );
        if( len > NAME_PRECISION )
        {
@@ -3647,7 +3645,6 @@ GetLongName(
 		  user_name, group_name,
 		  link_path );
        }
-#ifdef MULTIBYTE
      } else {
        /* MULTIBYTE
 	*
@@ -3710,7 +3707,6 @@ GetLongName(
 		user_name, group_name,
 		link_path );
      } /* is_multibyte */
-#endif  /* MULTIBYTE */
    }
 
    return (long_name);
diff --git a/cde/programs/dtfile/File.c b/cde/programs/dtfile/File.c
index 228be51b..34e541db 100644
--- a/cde/programs/dtfile/File.c
+++ b/cde/programs/dtfile/File.c
@@ -3142,27 +3142,17 @@ GetInsertPosition( int x1, int x2, XmFontList fontList, char * name )
   int i, width, stringWidth;
   char * tmp;
   char savedChar;
-#ifdef MULTIBYTE
   int len;
-#endif /* MULTIBYTE */
 
   width = x2 - x1;
 
-#ifdef MULTIBYTE
   i = 0;
   tmp = name;
   while ((len = mblen(tmp, MB_CUR_MAX)) > 0)
-#else /* MULTIBYTE */
-  for( tmp = name + 1, i = 0;
-       *tmp != 0x0;
-       ++tmp, ++i )
-#endif /* MULTIBYTE */
   {
     XmString string;
 
-#ifdef MULTIBYTE
     tmp += len;
-#endif /* MULTIBYTE */
 
     savedChar = *tmp;
     *tmp = 0x0;
@@ -3172,10 +3162,8 @@ GetInsertPosition( int x1, int x2, XmFontList fontList, char * name )
     *tmp = savedChar;
     if( stringWidth > width )
       break;
-#ifdef MULTIBYTE
     else
       i++;
-#endif /* MULTIBYTE */
   }
 
   return( i );
@@ -6357,13 +6345,8 @@ EstimateIconSize(
    if (file_view_data == NULL) {
       label_len = 1;
    } else {
-#ifdef MULTIBYTE
       label_len = DtCharCount(file_view_data->label == NULL ?
 			file_view_data->file_data->file_name : file_view_data->label);
-#else
-      label_len = strlen(file_view_data->label == NULL ?
-			file_view_data->file_data->file_name : file_view_data->label);
-#endif
    }
 
    if (layout_data->pixmap_position == XmPIXMAP_TOP)
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index bfb3fc68..70a939d5 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -14,7 +14,7 @@ XINLIB = -lDtXinerama -lXinerama
 #endif
 
 DEPEND_DEFINES = $(DEPENDDEFINES)
-DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \
+DEFINES = -DSHAPE -D_ILS_MACROS -DSUN_PERF \
 	-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
 	-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
 	-DKORNSHELL=\"$(KORNSHELL)\" $(XINOPT)
diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index e384acfe..217364c5 100644
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -5434,7 +5434,6 @@ static unsigned char
 {
     unsigned char *pchR = pchIn;
     register int   i;
-#ifdef MULTIBYTE
     register int   chlen;
 
     for (i = 0; ((chlen = mblen ((char *)pchIn, MB_CUR_MAX)) > 0); i++)
@@ -5447,19 +5446,8 @@ static unsigned char
         pchIn += chlen;
     }
 
-#else
-    for (i = 0; *pchIn && !isspace (*pchIn); i++, pchIn++)
-    /* find end of word */
-    {
-    }
-#endif
-
     /* skip to next word */
-#ifdef MULTIBYTE
     while (pchIn && (mblen ((char *)pchIn, MB_CUR_MAX) == 1) && isspace (*pchIn))
-#else
-    while (pchIn && isspace (*pchIn))
-#endif
     {
         *pchIn++;
     }
-- 
2.25.1