=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/miscf.c,v retrieving revision 1.2 retrieving revision 1.8 diff -u -p -r1.2 -r1.8 --- OpenXM_contrib2/asir2000/builtin/miscf.c 2000/01/18 05:55:05 1.2 +++ OpenXM_contrib2/asir2000/builtin/miscf.c 2000/08/22 05:03:59 1.8 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * 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 + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.7 2000/08/21 08:31:20 noro Exp $ +*/ #include "ca.h" #include "parse.h" #if INET && !defined(VISUAL) @@ -12,8 +60,6 @@ void Pr2g(), Pread_cmo(), Pwrite_cmo(); void Pgc(),Pbatch(),Psend_progress(); void Pnull_command(); void Pgetenv(); -void Plib_ox_push_cmo(),Plib_ox_pop_cmo(),Plib_ox_push_cmd(); -void Plib_ox_execute_string(); void delete_history(int,int); @@ -36,69 +82,15 @@ struct ftab misc_tab[] = { {"gc",Pgc,0}, {"batch",Pbatch,2}, {"send_progress",Psend_progress,-2}, -#if INET && !defined(VISUAL) +#if INET && !defined(VISUAL) && DO_PLOT {"xpause",Pxpause,0}, #endif #if 0 {"opt",Popt,1}, #endif -/* test functions for library mode ox operations */ - {"lib_ox_push_cmo",Plib_ox_push_cmo,1}, - {"lib_ox_pop_cmo",Plib_ox_pop_cmo,0}, - {"lib_ox_push_cmd",Plib_ox_push_cmd,1}, - {"lib_ox_execute_string",Plib_ox_execute_string,1}, {0,0,0}, }; -extern int little_endian; - -int lib_ox_initialized; - -void Plib_ox_push_cmo(arg,rp) -NODE arg; -Q *rp; -{ - void *cmo; - - if ( !lib_ox_initialized ) asir_ox_io_init(little_endian); - risa_to_cmo(ARG0(arg),&cmo); - asir_ox_push_cmo(cmo); - *rp = ONE; -} - -void Plib_ox_pop_cmo(rp) -Obj *rp; -{ - void *buf; - int ret,len; - - if ( !lib_ox_initialized ) asir_ox_io_init(little_endian); - len = asir_ox_peek_cmo_size(); - buf = (void *)MALLOC_ATOMIC(len); - ret = asir_ox_pop_cmo(buf,len); - if ( ret < 0 ) - error("lib_ox_pop_cmo : buffer too small (cannot happen!)"); - cmo_to_risa(buf,rp); -} - -void Plib_ox_push_cmd(arg,rp) -NODE arg; -Q *rp; -{ - if ( !lib_ox_initialized ) asir_ox_io_init(little_endian); - asir_ox_push_cmd((unsigned int)QTOS((Q)ARG0(arg))); - *rp = ONE; -} - -void Plib_ox_execute_string(arg,rp) -NODE arg; -Q *rp; -{ - if ( !lib_ox_initialized ) asir_ox_io_init(little_endian); - asir_ox_execute_string(BDY((STRING)ARG0(arg))); - *rp = ONE; -} - void Pgetenv(arg,rp) NODE arg; STRING *rp; @@ -130,7 +122,7 @@ pointer *rp; asir_terminate(2); else { closecurrentinput(); - if ( !asir_infile->fp ) + if ( !asir_infile->fp && strcmp(asir_infile->name,"string") ) asir_terminate(2); } *rp = 0; @@ -245,7 +237,9 @@ Q *rp; code = QTOS((Q)ARG0(arg)); reason = BDY((STRING)ARG1(arg)); action = BDY((STRING)ARG2(arg)); +#if defined(VISUAL) set_error(code,reason,action); +#endif error(""); *rp = 0; } @@ -333,7 +327,7 @@ Q *rp; STOQ(ret,*rp); } -#if INET && !defined(VISUAL) +#if INET && !defined(VISUAL) && DO_PLOT void Pxpause(rp) Q *rp; {