mars_nwe
/
mars-nwe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mars_nwe-0.97.pl06

This commit is contained in:
Mario Fetka 2011-11-13 00:38:56 +01:00
parent 306b5e3325
commit a051279129
9 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connect.c
View File

@ -573,7 +573,7 @@ static int build_path( NW_PATH *path,
* returns -0x98, if volume is wrong * returns -0x98, if volume is wrong
*/ */
{ {
uint8 vol[20]; uint8 vol[256];
conn_build_path_fn(vol, path->path, conn_build_path_fn(vol, path->path,
(only_dir) ? (uint8)NULL (only_dir) ? (uint8)NULL
: path->fn, : path->fn,
@ -1192,7 +1192,7 @@ int nw_search(uint8 *info,
{ {
NW_PATH nwpath; NW_PATH nwpath;
int completition= conn_get_kpl_path(&nwpath, dirhandle, data, len, 0); int completition = conn_get_kpl_path(&nwpath, dirhandle, data, len, 0);
XDPRINTF((5,0,"nw_search path:%s:, fn:%s:, completition:0x%x", XDPRINTF((5,0,"nw_search path:%s:, fn:%s:, completition:0x%x",
nwpath.path, nwpath.fn, completition)); nwpath.path, nwpath.fn, completition));
if (completition > -1) { if (completition > -1) {

10
doc/CREDITS
View File

@ -3,6 +3,9 @@ Sorry, but this list will *never* be complete.
Michael Beddow <m.beddow@servelan.co.uk> Michael Beddow <m.beddow@servelan.co.uk>
translated doc for PIPE-FS translated doc for PIPE-FS
Guntram Blohm <gbl%th7csun1@str.daimler-benz.com>
testing router code on token ring
Uwe Bonnes <bon@elektron.ikp.physik.th-darmstadt.de> Uwe Bonnes <bon@elektron.ikp.physik.th-darmstadt.de>
many testings+notes many testings+notes
@ -10,7 +13,7 @@ Hardy Buchholz <hardy@kool.f.eunet.de>
wrote HOWTO.ger wrote HOWTO.ger
Ales Dryak <A.Dryak@sh.cvut.cz> Ales Dryak <A.Dryak@sh.cvut.cz>
his linware gives the kick his linware gave the kick
Volker Lendecke <lendecke@math.uni-goettingen.de> Volker Lendecke <lendecke@math.uni-goettingen.de>
helps distributing helps distributing
@ -18,6 +21,9 @@ Volker Lendecke <lendecke@math.uni-goettingen.de>
James B. MacLean <macleajb@ednet.ns.ca> James B. MacLean <macleajb@ednet.ns.ca>
many testings+notes many testings+notes
Winfried Truemper <truemper@MI.Uni-Koeln.DE>: Jiri A. Randus <Jiri.Randus@vslib.cz>
testing bindery code
Winfried Truemper <truemper@mi.uni-koeln.de>:
re-wrote `INSTALL' and added explanations to `nw.ini' re-wrote `INSTALL' and added explanations to `nw.ini'

6
doc/mars_nwe.lsm
View File

@ -1,7 +1,7 @@
Begin3 Begin3
Title: mars_nwe Title: mars_nwe
Version: 0.97.pl5 Version: 0.97.pl6
Entered-date: 17-May-96 Entered-date: 21-May-96
Description: Full netware-emulator (src), beta. Description: Full netware-emulator (src), beta.
Supports file-services, bindery-services, Supports file-services, bindery-services,
printing-services, routing-services. printing-services, routing-services.
@ -9,7 +9,7 @@ Keywords: novell, netware, server, ipx, ncp, tli
Author: mstover@freeway.de (Martin Stover) Author: mstover@freeway.de (Martin Stover)
Maintained-by: mstover@freeway.de (Martin Stover) Maintained-by: mstover@freeway.de (Martin Stover)
Primary-site: ftp.gwdg.de:/pub/linux/misc/ncpfs Primary-site: ftp.gwdg.de:/pub/linux/misc/ncpfs
140kB mars_nwe-0.97.pl5.tgz 140kB mars_nwe-0.97.pl6.tgz
Alternate-site: ftp.uni-duisburg.de /pub/linux/ipxware Alternate-site: ftp.uni-duisburg.de /pub/linux/ipxware
Platforms: Linux (1.2.xx, 1.3.xx), UnixWare 2.0x Platforms: Linux (1.2.xx, 1.3.xx), UnixWare 2.0x
Copying-policy: GNU Copying-policy: GNU

5
examples/config.h
View File

@ -1,7 +1,8 @@
/* config.h: 13-May-96 */ /* config.h: 21-May-96 */
/* some of this config is needed by make, others by cc */ /* some of this config is needed by make, others by cc */
#define DO_DEBUG 1 /* compile in debug code */ #define DO_DEBUG 1 /* compile in debug code */
#define FUNC_17_02_IS_DEBUG 1 /* allow debugging with mars_dosutils */
#define DO_TESTING 0 /* set this to "1" to test only */ #define DO_TESTING 0 /* set this to "1" to test only */
@ -9,13 +10,11 @@
# define FILENAME_NW_INI "./nw.ini" /* full name of ini (conf) file */ # define FILENAME_NW_INI "./nw.ini" /* full name of ini (conf) file */
# define PATHNAME_PROGS "." /* where to find the executables */ # define PATHNAME_PROGS "." /* where to find the executables */
# define PATHNAME_BINDERY "." /* directory for bindery-files */ # define PATHNAME_BINDERY "." /* directory for bindery-files */
# define FUNC_17_02_IS_DEBUG 1
#else #else
# define FILENAME_NW_INI "/etc/nwserv.conf" # define FILENAME_NW_INI "/etc/nwserv.conf"
/* full name of ini (conf) file */ /* full name of ini (conf) file */
# define PATHNAME_PROGS "/sbin" /* where to find the executables */ # define PATHNAME_PROGS "/sbin" /* where to find the executables */
# define PATHNAME_BINDERY "/etc" /* directory for bindery-files */ # define PATHNAME_BINDERY "/etc" /* directory for bindery-files */
# define FUNC_17_02_IS_DEBUG 0
#endif #endif
#define PATHNAME_PIDFILES "/var/run" /* directory for 'pidfiles' */ #define PATHNAME_PIDFILES "/var/run" /* directory for 'pidfiles' */

4
makefile.unx
View File

@ -1,5 +1,5 @@
#if 0 #if 0
#makefile.unx 16-May-96 #makefile.unx 20-May-96
#endif #endif
VPATH=$(V_VPATH) VPATH=$(V_VPATH)
@ -9,7 +9,7 @@ C=.c
V_H=0 V_H=0
V_L=97 V_L=97
P_L=5 P_L=6
#define D_P_L 1 #define D_P_L 1
DISTRIB=mars_nwe DISTRIB=mars_nwe

2
net.h
View File

@ -128,7 +128,7 @@ extern int errno;
# endif # endif
#else #else
# undef FUNC_17_02_IS_DEBUG # undef FUNC_17_02_IS_DEBUG
# define FUNC_17_02_IS_DEBUG 0 # define FUNC_17_02_IS_DEBUG 0
#endif #endif
#ifndef MAX_CONNECTIONS #ifndef MAX_CONNECTIONS

8
nwconn.c
View File

@ -1451,6 +1451,12 @@ static void sig_quit(int rsig)
fl_get_int=2; fl_get_int=2;
} }
static void sig_pipe(int rsig)
{
XDPRINTF((1, 0, "Got SIG_PIPE"));
signal(SIGPIPE, sig_pipe);
}
static void sig_hup(int rsig) static void sig_hup(int rsig)
{ {
fl_get_int=1; fl_get_int=1;
@ -1468,7 +1474,7 @@ static void set_sig(void)
signal(SIGTERM, sig_quit); signal(SIGTERM, sig_quit);
signal(SIGQUIT, sig_quit); signal(SIGQUIT, sig_quit);
signal(SIGINT, sig_quit); signal(SIGINT, sig_quit);
signal(SIGPIPE, sig_quit); signal(SIGPIPE, sig_pipe);
signal(SIGHUP, sig_hup); signal(SIGHUP, sig_hup);
} }

3
nwfile.c
View File

@ -199,7 +199,8 @@ int nw_set_fdate_time(uint32 fhandle, uint8 *datum, uint8 *zeit)
int nw_close_datei(int fhandle, int reset_reuse) int nw_close_datei(int fhandle, int reset_reuse)
{ {
XDPRINTF((5, 0, "nw_close_datei handle=%d", fhandle)); XDPRINTF((5, 0, "nw_close_datei handle=%d, anz_fhandles",
fhandle, anz_fhandles));
if (fhandle > 0 && (fhandle <= anz_fhandles)) { if (fhandle > 0 && (fhandle <= anz_fhandles)) {
FILE_HANDLE *fh=&(file_handles[fhandle-1]); FILE_HANDLE *fh=&(file_handles[fhandle-1]);
if (reset_reuse) fh->flags &= (~4); if (reset_reuse) fh->flags &= (~4);

14
nwqueue.c
View File

@ -150,11 +150,17 @@ int ext_pclose(FILE_PIPE *fp)
void (*intsave) (int) = signal(SIGINT, SIG_IGN); void (*intsave) (int) = signal(SIGINT, SIG_IGN);
void (*quitsave)(int) = signal(SIGQUIT, SIG_IGN); void (*quitsave)(int) = signal(SIGQUIT, SIG_IGN);
void (*hupsave) (int) = signal(SIGHUP, SIG_IGN); void (*hupsave) (int) = signal(SIGHUP, SIG_IGN);
int j = 3; int j = 3;
while (j--) if (fp->fildes[j]) fclose(fp->fildes[j]); while (j--) if (fp->fildes[j]) fclose(fp->fildes[j]);
/* kill(fp->command_pid, SIGTERM); */ if (fp->command_pid != waitpid(fp->command_pid, &status, 0)) {
waitpid(fp->command_pid, &status, 0); kill(fp->command_pid, SIGTERM);
waitpid(fp->command_pid, &status, 0);
}
kill(fp->command_pid, SIGKILL); kill(fp->command_pid, SIGKILL);
signal(SIGINT, intsave); signal(SIGINT, intsave);
signal(SIGQUIT, quitsave); signal(SIGQUIT, quitsave);
signal(SIGHUP, hupsave); signal(SIGHUP, hupsave);
@ -389,8 +395,8 @@ int nw_close_file_queue(uint8 *queue_id,
is_ok=0; is_ok=0;
} }
} }
if (ext_pclose(fp)) { if (0 != (k=ext_pclose(fp))) {
XDPRINTF((1,0,"Error by closing print pipe")); XDPRINTF((1,0,"Errorresult = %d by closing print pipe", k));
} }
} else } else
XDPRINTF((1,0,"Cannot open pipe `%s`", printcommand)); XDPRINTF((1,0,"Cannot open pipe `%s`", printcommand));