comparison Wnn/jlib/jl.c @ 1:790205f476c0

applied wnn_dec12.diff

0:bbc77ca4def5

      if (wnn_errorno == WNN_JSERVER_DEAD)
        {
          jl_disconnect (env);
          return (-1);
        }
      if ((int) error_handler == WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
        {
          sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
          /*
             "辞書ファイル \"%s\" が無いよ。",
           */

        }
      sprintf (tmp, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
      /*
         "辞書ファイル \"%s\" が無いよ。作る?(Y/N)",
       */
      if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
        {
          if (create_file (env, dic_name, JISHO, -1,    /* -1 is dummy */
                           pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1)
            {
              return (-1);

          if (wnn_errorno == WNN_JSERVER_DEAD)
            {
              jl_disconnect (env);
              return (-1);
            }
          if ((int) error_handler == WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
            {
              sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
              /*
                 "頻度ファイル \"%s\" が無いよ。",
               */

            }
          sprintf (tmp, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
          /*
             "頻度ファイル \"%s\" が無いよ。作る?(Y/N)",
           */
          if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
            {
              if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1)
                return (-1);
            }
          else

          jl_disconnect (env);
          return (-1);
        }
      else if (wnn_errorno == WNN_HINDO_NO_MATCH)
        {
          if ((int) error_handler == WNN_NO_CREATE)
            {
              return (-1);
            }
          sprintf (tmp, msg_get (wnn_msg_cat, 204, NULL, env->lang), hindo_name);
          /*
             "辞書と頻度 \"%s\" の整合性が無いよ。作り直す?(Y/N)",
           */
          if (!((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp)))
            {
              return (-1);
            }
          if (file_discard (env, hfid) == -1)
            if_dead_disconnect (env, -1);

     int (*error_handler) (), (*message_handler) ();
{
  int level = 0;
  int x;
  wnn_errorno = 0;
  if ((int) error_handler == WNN_CREATE)
    {
      confirm_state = CREATE_WITHOUT_CONFIRM;
    }
  else if ((int) error_handler == WNN_NO_CREATE)
    {
      confirm_state = NO_CREATE;
    }
  else
    {

{
  register int total, flag;

  total = 0;
  flag = 0;
  while (*st != NULL)
    {
      if (isdigit (*st))
        {
          total = total * 10 + (*st - '0');
        }

      if (js_access (env, dirname, 0) == 0)
        {                       /* check for existence */
          return (0);           /* dir already exists */
        }
    }
  if ((int) error_handler != WNN_CREATE)
    {
      sprintf (gomi, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 210, NULL, env->lang), dirname, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
      /*
         "directry \"%s\" が無いよ。作る?(Y/N)",
       */

1:790205f476c0

      if (wnn_errorno == WNN_JSERVER_DEAD)
        {
          jl_disconnect (env);
          return (-1);
        }
      if (error_handler == (void *)WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
        {
          sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
          /*
             "辞書ファイル \"%s\" が無いよ。",
           */

        }
      sprintf (tmp, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
      /*
         "辞書ファイル \"%s\" が無いよ。作る?(Y/N)",
       */
      if (error_handler == (void *)WNN_CREATE || call_error_handler (error_handler, tmp))
        {
          if (create_file (env, dic_name, JISHO, -1,    /* -1 is dummy */
                           pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1)
            {
              return (-1);

          if (wnn_errorno == WNN_JSERVER_DEAD)
            {
              jl_disconnect (env);
              return (-1);
            }
          if (error_handler == (void *)WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
            {
              sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
              /*
                 "頻度ファイル \"%s\" が無いよ。",
               */

            }
          sprintf (tmp, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
          /*
             "頻度ファイル \"%s\" が無いよ。作る?(Y/N)",
           */
          if (error_handler == (void *)WNN_CREATE || call_error_handler (error_handler, tmp))
            {
              if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1)
                return (-1);
            }
          else

          jl_disconnect (env);
          return (-1);
        }
      else if (wnn_errorno == WNN_HINDO_NO_MATCH)
        {
            if (error_handler == (void *)WNN_NO_CREATE)
            {
              return (-1);
            }
          sprintf (tmp, msg_get (wnn_msg_cat, 204, NULL, env->lang), hindo_name);
          /*
             "辞書と頻度 \"%s\" の整合性が無いよ。作り直す?(Y/N)",
           */
          if (!(error_handler == (void *)WNN_CREATE || call_error_handler (error_handler, tmp)))
            {
              return (-1);
            }
          if (file_discard (env, hfid) == -1)
            if_dead_disconnect (env, -1);

     int (*error_handler) (), (*message_handler) ();
{
  int level = 0;
  int x;
  wnn_errorno = 0;
  if (error_handler == (void *)WNN_CREATE)
    {
      confirm_state = CREATE_WITHOUT_CONFIRM;
    }
  else if (error_handler == (void *)WNN_NO_CREATE)
    {
      confirm_state = NO_CREATE;
    }
  else
    {

{
  register int total, flag;

  total = 0;
  flag = 0;
  while (*st != '\0')
    {
      if (isdigit (*st))
        {
          total = total * 10 + (*st - '0');
        }

      if (js_access (env, dirname, 0) == 0)
        {                       /* check for existence */
          return (0);           /* dir already exists */
        }
    }
  if (error_handler != (void *)WNN_CREATE)
    {
      sprintf (gomi, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 210, NULL, env->lang), dirname, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
      /*
         "directry \"%s\" が無いよ。作る?(Y/N)",
       */