Print this page
make: translate using gettext, rather than the unmaintainable catgets

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/lib/vroot/vroot.cc
          +++ new/usr/src/cmd/make/lib/vroot/vroot.cc
↓ open down ↓ 26 lines elided ↑ open up ↑
  27   27  #include <stdlib.h>
  28   28  #include <string.h>
  29   29  
  30   30  #include <vroot/vroot.h>
  31   31  #include <vroot/args.h>
  32   32  
  33   33  #include <string.h>
  34   34  #include <sys/param.h>
  35   35  #include <sys/file.h>
  36   36  
  37      -#include <avo/intl.h>   /* for NOCATGETS */
  38      -
  39   37  typedef struct {
  40   38          short           init;
  41   39          pathpt          vector;
  42   40          const char      *env_var;
  43   41  } vroot_patht;
  44   42  
  45   43  typedef struct {
  46   44          vroot_patht     vroot;
  47   45          vroot_patht     path;
  48   46          char            full_path[MAXPATHLEN+1];
  49   47          char            *vroot_start;
  50   48          char            *path_start;
  51   49          char            *filename_start;
  52   50          int             scan_vroot_first;
  53   51          int             cpp_style_path;
  54   52  } vroot_datat, *vroot_datapt;
  55   53  
  56   54  static vroot_datat      vroot_data= {
  57      -        { 0, NULL, NOCATGETS("VIRTUAL_ROOT")},
  58      -        { 0, NULL, NOCATGETS("PATH")},
       55 +        { 0, NULL, "VIRTUAL_ROOT"},
       56 +        { 0, NULL, "PATH"},
  59   57          "", NULL, NULL, NULL, 0, 1};
  60   58  
  61   59  void
  62   60  add_dir_to_path(const char *path, register pathpt *pointer, register int position)
  63   61  {
  64   62          register int            size= 0;
  65   63          register int            length;
  66   64          register char           *name;
  67   65          register pathcellpt     p;
  68   66          pathpt                  new_path;
↓ open down ↓ 272 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX