nial/nial.patch2

   1 diff -rupN build//coreif.c tmp/coreif.c
   2 --- build//coreif.c     2006-11-07 19:51:11.000000000 +0000
   3 +++ tmp/coreif.c        2010-12-04 16:44:44.146666460 +0000
   4 @@ -504,9 +504,12 @@ NC_UpdateWindowSettings(long WindowSetti
   5    WindowSettingsTable[WindowSettings - 1]->trace_on = trace;
   6    WindowSettingsTable[WindowSettings - 1]->log_on = keeplog;
   7
   8 -  NC_SetWindowSetting(WindowSettings, NC_LOG_NAME, (int) logfnm);
   9 -  NC_SetWindowSetting(WindowSettings, NC_FORMAT, (int) getformat());
  10 -  NC_SetWindowSetting(WindowSettings, NC_PROMPT, (int) prompt);
  11 +//  NC_SetWindowSetting(WindowSettings, NC_LOG_NAME, (int) logfnm);
  12 +// NC_SetWindowSetting(WindowSettings, NC_FORMAT, (int) getformat());
  13 +//  NC_SetWindowSetting(WindowSettings, NC_PROMPT, (int) prompt);
  14 +  NC_SetWindowSetting(WindowSettings, NC_LOG_NAME, (size_t) logfnm);
  15 + NC_SetWindowSetting(WindowSettings, NC_FORMAT, (size_t) getformat());
  16 +  NC_SetWindowSetting(WindowSettings, NC_PROMPT, (size_t) prompt);
  17    WindowSettingsTable[WindowSettings - 1]->screenWidth = ssizew;
  18    WindowSettingsTable[WindowSettings - 1]->useHistory = usehistory;
  19  }
  20 @@ -669,10 +672,9 @@ NC_CreateSessionSettings(void)
  21  */
  22
  23  int         _EXPORT_
  24 -NC_SetSessionSetting(long ioSettings, int inFeature, int inValue)
  25 +NC_SetSessionSetting(long ioSettings, int inFeature, size_t inValue)
  26  {
  27    int         len;
  28 -
  29    DIAG_MSG3("SetSessionSettings", ioSettings, inFeature, inValue);
  30
  31    /* check if ioSettings actually exist... */
  32 @@ -792,7 +794,7 @@ NC_GetSessionSetting(long ioSettings, in
  33          break;
  34
  35      case NC_INITIAL_DEFS:
  36 -        *inValue = (int) SessionSettingsTable[ioSettings - 1]->defs_name;
  37 +        *inValue = (size_t) SessionSettingsTable[ioSettings - 1]->defs_name;
  38          break;
  39
  40      case NC_QUIET:
  41 @@ -804,7 +806,7 @@ NC_GetSessionSetting(long ioSettings, in
  42          break;
  43
  44      case NC_INITIAL_WORKSPACE:
  45 -        *inValue = (int) SessionSettingsTable[ioSettings - 1]->ws_name;
  46 +        *inValue = (size_t) SessionSettingsTable[ioSettings - 1]->ws_name;
  47          break;
  48
  49      default:
  50 @@ -923,11 +925,11 @@ NC_CreateWindowSettings(void)
  51  */
  52
  53  int         _EXPORT_
  54 -NC_SetWindowSetting(long ioSettings, int inFeature, int inValue)
  55 +NC_SetWindowSetting(long ioSettings, int inFeature, size_t inValue)
  56  {
  57    int         len;
  58
  59 -  DIAG_MSG3("SetWindowSetting", ioSettings, inFeature, (int) inValue);
  60 +  DIAG_MSG3("SetWindowSetting", ioSettings, inFeature, (sizt_t) inValue);
  61
  62    /* check if ioSettings actually exist... */
  63    if (!ioSettings ||
  64 @@ -1105,16 +1107,16 @@ NC_GetWindowSetting(long ioSettings, int
  65          break;
  66
  67      case NC_LOG_NAME:
  68 -        *outValue = (int) WindowSettingsTable[ioSettings - 1]->log_name;
  69 +        *outValue = (size_t) WindowSettingsTable[ioSettings - 1]->log_name;
  70          break;
  71      case NC_PROMPT:
  72 -        *outValue = (int) WindowSettingsTable[ioSettings - 1]->wprompt;
  73 +        *outValue = (size_t) WindowSettingsTable[ioSettings - 1]->wprompt;
  74          break;
  75      case NC_FORMAT:
  76 -        *outValue = (int) WindowSettingsTable[ioSettings - 1]->format;
  77 +        *outValue = (size_t) WindowSettingsTable[ioSettings - 1]->format;
  78          break;
  79      case NC_USE_HISTORY:
  80 -        *outValue = (int) WindowSettingsTable[ioSettings - 1]->useHistory;
  81 +        *outValue = (size_t) WindowSettingsTable[ioSettings - 1]->useHistory;
  82          break;
  83      default:
  84          /* programmer's error */
  85 diff -rupN build//coreif_p.h tmp/coreif_p.h
  86 --- build//coreif_p.h   2006-11-07 19:51:11.000000000 +0000
  87 +++ tmp/coreif_p.h      2010-12-04 16:44:44.146666460 +0000
  88 @@ -186,7 +186,7 @@ _EXTERN_ int _EXPORT_ NC_StopNial(void);
  89  _EXTERN_ long _EXPORT_ NC_CreateSessionSettings(void);
  90  _EXTERN_ int _EXPORT_
  91  NC_SetSessionSetting(long ioSettings,
  92 -                     int inFeature, int inValue);
  93 +                     int inFeature, size_t inValue);
  94  _EXTERN_ int _EXPORT_
  95  NC_GetSessionSetting(long ioSettings,
  96                       int inFeature, int *inValue);
  97 @@ -201,7 +201,7 @@ NC_SetCheckUserBreak(long ioSettings,
  98  _EXTERN_ long _EXPORT_ NC_CreateWindowSettings(void);
  99  _EXTERN_ int _EXPORT_
 100  NC_SetWindowSetting(long ioSettings,
 101 -                    int inFeature, int inValue);
 102 +                    int inFeature, size_t inValue);
 103  _EXTERN_ int _EXPORT_
 104  NC_GetWindowSetting(long ioSettings,
 105                      int inFeature, int *outValue);
 106 diff -rupN build//main_stu.c tmp/main_stu.c
 107 --- build//main_stu.c   2006-11-07 19:51:11.000000000 +0000
 108 +++ tmp/main_stu.c      2010-12-04 16:44:44.146666460 +0000
 109 @@ -382,10 +382,10 @@ main(int argc, char *memin[])
 110                                  NC_EXPANSION, expansion));
 111    if (loadsw)
 112      CheckErr(NC_SetSessionSetting(sessionSettings,
 113 -                                  NC_INITIAL_WORKSPACE, (int) inloadfnm));
 114 +                                  NC_INITIAL_WORKSPACE, (size_t) inloadfnm));
 115    if (defssw)
 116      CheckErr(NC_SetSessionSetting(sessionSettings,
 117 -                                  NC_INITIAL_DEFS, (int) indefsfnm));
 118 +                                  NC_INITIAL_DEFS, (size_t) indefsfnm));
 119
 120    CheckErr(NC_SetSessionSetting(sessionSettings,
 121                                  NC_QUIET, quiet));
 122 @@ -395,7 +395,7 @@ main(int argc, char *memin[])
 123    windSettings = NC_CreateWindowSettings();
 124
 125    if (iscgiversion) /* avoid output by having no prompt in CGINIAL */
 126 -    CheckErr(NC_SetWindowSetting(windSettings, NC_PROMPT, (int) ""));
 127 +    CheckErr(NC_SetWindowSetting(windSettings, NC_PROMPT, (size_t) ""));
 128
 129    /* The CGINIAL version is given a default 0 screen width setting,
 130       so no lines are broken.  */
 131 diff -rupN build//makefile tmp/makefile
 132 --- build//makefile     2007-02-08 19:22:03.000000000 +0000
 133 +++ tmp/makefile        2010-12-04 17:01:01.743333116 +0000
 134 @@ -41,11 +41,11 @@ VERSION=
 135
 136  #if SOLARIS & gcc turn these on
 137
 138 -CC= gcc
 139 -CCC= g++
 140 -WFLAG= -Wall
 141 -CSFLAG= -pipe
 142 -SYSFLAG= -DSUN4 -DSOLARIS2 -DUNIXSYS  $(VERSION)
 143 +#CC= gcc
 144 +#CCC= g++
 145 +#WFLAG= -Wall
 146 +#CSFLAG= -pipe
 147 +#SYSFLAG= -DSUN4 -DSOLARIS2 -DUNIXSYS  $(VERSION)
 148
 149
 150  # Choose an alternate target by uncommenting a group below or creating a new group
 151 @@ -54,11 +54,11 @@ SYSFLAG= -DSUN4 -DSOLARIS2 -DUNIXSYS  $(
 152
 153  #if LINUX & gcc turn these on
 154
 155 -#CCC= g++
 156 -#CC= gcc
 157 -#WFLAG= -Wall
 158 -#CSFLAG= -pipe
 159 -#SYSFLAG= -DLINUX -DUNIXSYS
 160 +CCC= g++
 161 +CC= gcc
 162 +WFLAG= -Wall
 163 +CSFLAG= -pipe
 164 +SYSFLAG= -DLINUX -DUNIXSYS
 165
 166
 167  #if SUNOS & cc on a SUN turns these on
 168 @@ -144,7 +144,7 @@ DEBUGFLAG=
 169  DEBUG_LIB=
 170
 171  # the socket lib used with Windows and gcc on Solaris
 172 -SOCKLIB= -lsocket -lnsl
 173 +#SOCKLIB= -lsocket -lnsl
 174  #SOCKLIB=
 175
 176  LIBS= -lm -ltermcap $(DEBUG_LIB) $(SOCKLIB)