diff options
author | hobbs <hobbs> | 2000-04-04 08:05:56 (GMT) |
---|---|---|
committer | hobbs <hobbs> | 2000-04-04 08:05:56 (GMT) |
commit | d629aa94a6179c6ebf2844bd69030aca52dd7d73 (patch) | |
tree | 3eb21c1dfdcab1889714ea4a4597fbd0320d5ad5 | |
parent | 2fcb38b7326ab3bf96de39eebb600bef826428d6 (diff) | |
download | tcl-d629aa94a6179c6ebf2844bd69030aca52dd7d73.zip tcl-d629aa94a6179c6ebf2844bd69030aca52dd7d73.tar.gz tcl-d629aa94a6179c6ebf2844bd69030aca52dd7d73.tar.bz2 |
* unix/Makefile.in (MAN_INSTALL_DIR): patch to accept --mandir
correctly [Bug: 4085]
* unix/tclUnixFCmd.c (SetGroupAttribute):
* unix/tclUnixFCmd.c (SetOwnerAttribute): Added (uid_t) and (gid_t)
casts to avoid compiler warnings.
-rw-r--r-- | unix/Makefile.in | 6 | ||||
-rw-r--r-- | unix/tclUnixFCmd.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index a30bafb..2cc3f20 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.59 2000/02/14 22:40:56 ericm Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.60 2000/04/04 08:05:56 hobbs Exp $ VERSION = @TCL_VERSION@ @@ -51,7 +51,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include # Top-level directory in which to install manual entries: -MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man +MAN_INSTALL_DIR = $(INSTALL_ROOT)@mandir@ # Directory in which to install manual entry for tclsh: MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1 @@ -460,7 +460,7 @@ topDirName: gendate: yacc -l $(GENERIC_DIR)/tclGetDate.y sed -e 's/yy/TclDate/g' -e '/^#include <values.h>/d' \ - -e 's?SCCSID?RCS: @(#) $$Id: Makefile.in,v 1.59 2000/02/14 22:40:56 ericm Exp $$?' \ + -e 's?SCCSID?RCS: @(#) $$Id: Makefile.in,v 1.60 2000/04/04 08:05:56 hobbs Exp $$?' \ -e '/#ifdef __STDC__/,/#endif/d' -e '/TclDateerrlab:/d' \ -e '/TclDatenewstate:/d' -e '/#pragma/d' \ -e '/#include <inttypes.h>/d' -e 's/const /CONST /g' \ diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index f396d45..20998ca 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixFCmd.c,v 1.5 2000/01/12 11:13:55 hobbs Exp $ + * RCS: @(#) $Id: tclUnixFCmd.c,v 1.6 2000/04/04 08:05:57 hobbs Exp $ * * Portions of this code were derived from NetBSD source code which has * the following copyright notice: @@ -1247,7 +1247,7 @@ SetGroupAttribute(interp, objIndex, fileName, attributePtr) } native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds); - result = chown(native, -1, (gid_t) gid); /* INTL: Native. */ + result = chown(native, (uid_t) -1, (gid_t) gid); /* INTL: Native. */ Tcl_DStringFree(&ds); endgrent(); @@ -1308,14 +1308,14 @@ SetOwnerAttribute(interp, objIndex, fileName, attributePtr) } native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds); - result = chown(native, uid, -1); /* INTL: Native. */ + result = chown(native, (uid_t) uid, (gid_t) -1); /* INTL: Native. */ Tcl_DStringFree(&ds); if (result != 0) { Tcl_AppendResult(interp, "could not set owner for file \"", fileName, "\": ", Tcl_PosixError(interp), (char *) NULL); return TCL_ERROR; - } + } return TCL_OK; } |