[BACK]Return to help.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/help.c between version 1.3 and 1.6

version 1.3, 2000/08/21 08:31:20 version 1.6, 2009/02/14 08:46:14
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/builtin/help.c,v 1.2 1999/12/21 04:20:41 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/help.c,v 1.5 2004/06/25 05:20:09 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 93  char *s;
Line 93  char *s;
         extern char *asir_pager;          extern char *asir_pager;
         char *e;          char *e;
         static char helpdir[16];          static char helpdir[16];
           static int  ja_JP_UTF_8 = 0;
   
         if ( !helpdir[0] ) {          if ( !helpdir[0] ) {
                 e = (char *)getenv("LANG");                  e = (char *)getenv("LANG");
                 if ( !e )                  if ( !e )
                         strcpy(helpdir,"help");                          strcpy(helpdir,"help");
                 else if ( !strncmp(e,"japan",strlen("japan"))                  else if ( !strncmp(e,"japan",strlen("japan"))
                         || !strncmp(e,"ja_JP",strlen("ja_JP")) )                                    || !strncmp(e,"ja_JP",strlen("ja_JP")) ) {
                         strcpy(helpdir,"help-jp");                          strcpy(helpdir,"help-jp");
                 else                          if (strcmp(e,"ja_JP.UTF-8")==0) ja_JP_UTF_8 = 1;
                   }else
                         strcpy(helpdir,"help-eg");                          strcpy(helpdir,"help-eg");
         }          }
   
Line 117  char *s;
Line 119  char *s;
                 sprintf(name,"%s/%s/%s",asir_libdir,helpdir,s);                  sprintf(name,"%s/%s/%s",asir_libdir,helpdir,s);
                 if ( fp = fopen(name,"r") ) {                  if ( fp = fopen(name,"r") ) {
                         fclose(fp);                          fclose(fp);
                         sprintf(com,"%s %s",asir_pager,name);                          if (!ja_JP_UTF_8)
                             sprintf(com,"%s %s",asir_pager,name);
                           else
                             sprintf(com,"nkf -w %s | %s ",name,asir_pager);
                         system(com);                          system(com);
                 } else {                  } else {
                         searchf(usrf,s,&f);                          gen_searchf_searchonly(s,&f);
                         if ( f && f->f.usrf->desc )                          if ( f && f->id == A_USR && f->f.usrf->desc )
                                 fprintf(stderr,"%s\n",f->f.usrf->desc);                                  fprintf(stderr,"%s\n",f->f.usrf->desc);
                 }                  }
 #endif  #endif
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>