[Midnightbsd-cvs] src [11155] trunk/contrib/smbfs: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 27 08:50:57 EDT 2018
Revision: 11155
http://svnweb.midnightbsd.org/src/?rev=11155
Author: laffer1
Date: 2018-06-27 08:50:57 -0400 (Wed, 27 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/contrib/smbfs/Makefile
trunk/contrib/smbfs/Makefile.inc
trunk/contrib/smbfs/README
trunk/contrib/smbfs/config.mk.in
trunk/contrib/smbfs/examples/dot.nsmbrc
trunk/contrib/smbfs/examples/print/printcap.sample
trunk/contrib/smbfs/examples/smbfs.sh.sample
trunk/contrib/smbfs/include/cflib.h
trunk/contrib/smbfs/include/netsmb/nb_lib.h
trunk/contrib/smbfs/include/netsmb/smb_lib.h
trunk/contrib/smbfs/include/netsmb/smb_rap.h
trunk/contrib/smbfs/lib/Makefile
trunk/contrib/smbfs/lib/Makefile.inc
trunk/contrib/smbfs/lib/smb/Makefile
trunk/contrib/smbfs/lib/smb/cfopt.c
trunk/contrib/smbfs/lib/smb/ctx.c
trunk/contrib/smbfs/lib/smb/file.c
trunk/contrib/smbfs/lib/smb/kiconv.c
trunk/contrib/smbfs/lib/smb/mbuf.c
trunk/contrib/smbfs/lib/smb/nb.c
trunk/contrib/smbfs/lib/smb/nb_name.c
trunk/contrib/smbfs/lib/smb/nb_net.c
trunk/contrib/smbfs/lib/smb/nbns_rq.c
trunk/contrib/smbfs/lib/smb/nls.c
trunk/contrib/smbfs/lib/smb/print.c
trunk/contrib/smbfs/lib/smb/rap.c
trunk/contrib/smbfs/lib/smb/rcfile.c
trunk/contrib/smbfs/lib/smb/rq.c
trunk/contrib/smbfs/lib/smb/subr.c
trunk/contrib/smbfs/mount_smbfs/mount_smbfs.8
trunk/contrib/smbfs/mount_smbfs/mount_smbfs.c
Modified: trunk/contrib/smbfs/Makefile
===================================================================
--- trunk/contrib/smbfs/Makefile 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/Makefile 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,4 +1,5 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $MidnightBSD$
+# $Id: Makefile,v 1.12 2001/04/16 04:34:26 bp Exp $
#
# Valid targets:
# install installs binaries and man pages
Modified: trunk/contrib/smbfs/Makefile.inc
===================================================================
--- trunk/contrib/smbfs/Makefile.inc 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/Makefile.inc 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,4 +1,5 @@
-# $Id: Makefile.inc,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $MidnightBSD$
+# $Id: Makefile.inc,v 1.11 2002/04/16 02:57:46 bp Exp $
.ifmake !clean && !cleandepend
.if !defined(PREFIX)
Modified: trunk/contrib/smbfs/README
===================================================================
--- trunk/contrib/smbfs/README 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/README 2018-06-27 12:50:57 UTC (rev 11155)
@@ -15,7 +15,7 @@
Darwin maintained in the Darwin's tree.
- I'm would be very grateful for any feedback, bug reports etc.
+ I would be very grateful for any feedback, bug reports etc.
Supported SMB servers:
Samba
@@ -23,14 +23,14 @@
IBM LanManager
NetApp
- An updated versions of this package can be retrieved from ftp server:
+ An updated version of this package can be retrieved from ftp server:
ftp://ftp.butya.kz/pub/smbfs/smbfs.tar.gz
- Perfomance
+ Performance
==========
- There is some perfomance benchmarks over 10Mbit network:
+ These are some performance benchmarks over a 10Mbit network:
Win95 machine as server:
IOZONE: auto-test mode
Modified: trunk/contrib/smbfs/config.mk.in
===================================================================
--- trunk/contrib/smbfs/config.mk.in 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/config.mk.in 2018-06-27 12:50:57 UTC (rev 11155)
@@ -2,7 +2,7 @@
# copy this file to config.mk and edit as needed.
# If you want to disable an option just comment it with '#' char.
#
-# $Id: config.mk.in,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $Id: config.mk.in,v 1.16 2001/04/16 04:34:26 bp Exp $
# Where your kernel source tree located (/usr/src/sys for example)
SYSDIR=/usr/src/sys
Modified: trunk/contrib/smbfs/examples/dot.nsmbrc
===================================================================
--- trunk/contrib/smbfs/examples/dot.nsmbrc 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/examples/dot.nsmbrc 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,6 +1,5 @@
-# $Id: dot.nsmbrc,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
-# $FreeBSD: src/contrib/smbfs/examples/dot.nsmbrc,v 1.2 2004/07/17 14:38:42 bp Exp $
-# $MidnightBSD$
+# $Id: dot.nsmbrc,v 1.7 2002/04/10 04:21:11 bp Exp $
+# $FreeBSD: stable/10/contrib/smbfs/examples/dot.nsmbrc 132289 2004-07-17 14:38:42Z bp $
#
# Example for .nsmbrc file
#
Modified: trunk/contrib/smbfs/examples/print/printcap.sample
===================================================================
--- trunk/contrib/smbfs/examples/print/printcap.sample 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/examples/print/printcap.sample 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,4 +1,4 @@
-# $Id: printcap.sample,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $Id: printcap.sample,v 1.1 2000/06/11 08:13:28 bp Exp $
# Sample printcap entry for NetWare printer
fserverlj|LJ6L on the fserver:\
Modified: trunk/contrib/smbfs/examples/smbfs.sh.sample
===================================================================
--- trunk/contrib/smbfs/examples/smbfs.sh.sample 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/examples/smbfs.sh.sample 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $Id: smbfs.sh.sample,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
-# $MidnightBSD$
+# $Id: smbfs.sh.sample,v 1.3 2001/01/13 04:50:36 bp Exp $
#
# Location: /usr/local/etc/rc.d/smbfs.sh
#
Modified: trunk/contrib/smbfs/include/cflib.h
===================================================================
--- trunk/contrib/smbfs/include/cflib.h 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/include/cflib.h 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2000, Boris Popov
* All rights reserved.
@@ -29,8 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cflib.h,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: cflib.h,v 1.3 2000/07/11 01:51:49 bp Exp $
*/
#ifndef _zzzzzz_RCFILE_H_
#define _zzzzzz_RCFILE_H_
Modified: trunk/contrib/smbfs/include/netsmb/nb_lib.h
===================================================================
--- trunk/contrib/smbfs/include/netsmb/nb_lib.h 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/include/netsmb/nb_lib.h 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,9 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nb_lib.h,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/include/netsmb/nb_lib.h,v 1.2 2005/10/02 08:32:48 bp Exp $
- * $MidnightBSD$
+ * $Id: nb_lib.h,v 1.2 2000/07/17 01:49:27 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/include/netsmb/nb_lib.h 150802 2005-10-02 08:32:49Z bp $
*/
#ifndef _NETSMB_NB_LIB_H_
#define _NETSMB_NB_LIB_H_
Modified: trunk/contrib/smbfs/include/netsmb/smb_lib.h
===================================================================
--- trunk/contrib/smbfs/include/netsmb/smb_lib.h 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/include/netsmb/smb_lib.h 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,9 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: smb_lib.h,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/include/netsmb/smb_lib.h,v 1.3 2005/10/02 08:32:48 bp Exp $
- * $MidnightBSD$
+ * $Id: smb_lib.h,v 1.24 2001/12/20 15:19:43 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/include/netsmb/smb_lib.h 282275 2015-04-30 16:08:47Z tijl $
*/
#ifndef _NETSMB_SMB_LIB_H_
#define _NETSMB_SMB_LIB_H_
@@ -192,7 +191,7 @@
int smb_ctx_resolve(struct smb_ctx *);
int smb_ctx_setflags(struct smb_ctx *, int, int, int);
-int smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*);
+int smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*);
int smb_smb_close_print_file(struct smb_ctx *, smbfh);
int smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *);
@@ -205,8 +204,8 @@
void smb_rq_done(struct smb_rq *);
void smb_rq_wend(struct smb_rq *);
int smb_rq_simple(struct smb_rq *);
-int smb_rq_dmem(struct mbdata *, const char *, size_t);
-int smb_rq_dstring(struct mbdata *, const char *);
+int smb_rq_dmem(struct mbdata *, char *, size_t);
+int smb_rq_dstring(struct mbdata *, char *);
int smb_t2_request(struct smb_ctx *, int, int, const char *,
int, void *, int, void *, int *, void *, int *, void *);
@@ -247,10 +246,10 @@
int nls_setrecode(const char *, const char *);
int nls_setlocale(const char *);
-char* nls_str_toext(char *, const char *);
-char* nls_str_toloc(char *, const char *);
-void* nls_mem_toext(void *, const void *, int);
-void* nls_mem_toloc(void *, const void *, int);
+char* nls_str_toext(char *, char *);
+char* nls_str_toloc(char *, char *);
+void* nls_mem_toext(void *, void *, int);
+void* nls_mem_toloc(void *, void *, int);
char* nls_str_upper(char *, const char *);
char* nls_str_lower(char *, const char *);
Modified: trunk/contrib/smbfs/include/netsmb/smb_rap.h
===================================================================
--- trunk/contrib/smbfs/include/netsmb/smb_rap.h 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/include/netsmb/smb_rap.h 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: smb_rap.h,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: smb_rap.h,v 1.3 2001/04/10 05:37:22 bp Exp $
*/
#ifndef _NETSMB_SMB_RAP_H_
#define _NETSMB_SMB_RAP_H_
Modified: trunk/contrib/smbfs/lib/Makefile
===================================================================
--- trunk/contrib/smbfs/lib/Makefile 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/Makefile 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,4 +1,5 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $MidnightBSD$
+# $Id: Makefile,v 1.5 2001/02/24 15:56:04 bp Exp $
.ifmake !clean && !cleandepend
.include "../config.int"
Modified: trunk/contrib/smbfs/lib/Makefile.inc
===================================================================
--- trunk/contrib/smbfs/lib/Makefile.inc 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/Makefile.inc 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
#
CFLAGS+= -I${.CURDIR}/../../include
Modified: trunk/contrib/smbfs/lib/smb/Makefile
===================================================================
--- trunk/contrib/smbfs/lib/smb/Makefile 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/Makefile 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $Id: Makefile,v 1.12 2001/04/16 14:27:35 bp Exp $
LIB= smb
Modified: trunk/contrib/smbfs/lib/smb/cfopt.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/cfopt.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/cfopt.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cfopt.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+ * $Id: cfopt.c,v 1.3 2000/07/11 01:51:49 bp Exp $
*/
#include <sys/param.h>
Modified: trunk/contrib/smbfs/lib/smb/ctx.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/ctx.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/ctx.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ctx.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/ctx.c,v 1.7 2005/10/02 08:32:48 bp Exp $
+ * $Id: ctx.c,v 1.24 2002/04/13 14:35:28 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/ctx.c 272119 2014-09-25 17:59:00Z trasz $
*/
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -191,10 +191,6 @@
smb_error("no user name required", 0);
return EINVAL;
}
- if (*p1 == 0) {
- smb_error("empty user name", 0);
- return EINVAL;
- }
error = smb_ctx_setuser(ctx, tmp);
if (error)
return error;
@@ -521,11 +517,6 @@
smb_error("no server name specified", 0);
return EINVAL;
}
- if (ssn->ioc_user[0] == 0) {
- smb_error("no user name specified for server %s",
- 0, ssn->ioc_srvname);
- return EINVAL;
- }
if (ctx->ct_minlevel >= SMBL_SHARE && sh->ioc_share[0] == 0) {
smb_error("no share name specified for %s@%s",
0, ssn->ioc_user, ssn->ioc_srvname);
@@ -602,40 +593,12 @@
int fd, i;
char buf[20];
- /*
- * First, try to open as cloned device
- */
fd = open("/dev/"NSMB_NAME, O_RDWR);
if (fd >= 0) {
ctx->ct_fd = fd;
return 0;
}
- /*
- * well, no clone capabilities available - we have to scan
- * all devices in order to get free one
- */
- for (i = 0; i < 1024; i++) {
- snprintf(buf, sizeof(buf), "/dev/%s%d", NSMB_NAME, i);
- fd = open(buf, O_RDWR);
- if (fd >= 0) {
- ctx->ct_fd = fd;
- return 0;
- }
- }
- /*
- * This is a compatibility with old /dev/net/nsmb device
- */
- for (i = 0; i < 1024; i++) {
- snprintf(buf, sizeof(buf), "/dev/net/%s%d", NSMB_NAME, i);
- fd = open(buf, O_RDWR);
- if (fd >= 0) {
- ctx->ct_fd = fd;
- return 0;
- }
- if (errno == ENOENT)
- return ENOENT;
- }
- return ENOENT;
+ return ENOENT;
}
int
Modified: trunk/contrib/smbfs/lib/smb/file.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/file.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/file.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: file.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/file.c,v 1.2 2004/07/28 05:33:58 kan Exp $
+ * $Id: file.c,v 1.2 2001/04/16 04:33:01 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/file.c 132752 2004-07-28 05:33:58Z kan $
*/
#include <sys/param.h>
#include <sys/sysctl.h>
Modified: trunk/contrib/smbfs/lib/smb/kiconv.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/kiconv.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/kiconv.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kiconv.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.4 2005/08/24 12:38:26 imura Exp $
+ * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/kiconv.c 149415 2005-08-24 12:38:26Z imura $
*/
#include <sys/types.h>
Modified: trunk/contrib/smbfs/lib/smb/mbuf.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/mbuf.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/mbuf.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mbuf.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
+ * $Id: mbuf.c,v 1.6 2001/02/24 15:56:04 bp Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.3 2005/09/19 08:07:18 imura Exp $");
+__FBSDID("$FreeBSD: stable/10/contrib/smbfs/lib/smb/mbuf.c 150312 2005-09-19 08:07:18Z imura $");
#include <sys/types.h>
#include <sys/endian.h>
Modified: trunk/contrib/smbfs/lib/smb/nb.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/nb.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/nb.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nb.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/nb.c,v 1.2 2005/10/02 08:32:48 bp Exp $
+ * $Id: nb.c,v 1.4 2001/04/16 04:33:01 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/nb.c 150802 2005-10-02 08:32:49Z bp $
*/
#include <sys/param.h>
#include <sys/socket.h>
Modified: trunk/contrib/smbfs/lib/smb/nb_name.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/nb_name.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/nb_name.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nb_name.c,v 1.2 2013-08-24 12:08:36 laffer1 Exp $
+ * $Id: nb_name.c,v 1.2 2001/08/22 03:31:36 bp Exp $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/smbfs/lib/smb/nb_name.c 294364 2016-01-19 23:36:49Z ian $");
#include <sys/param.h>
#include <sys/endian.h>
@@ -143,15 +143,13 @@
return len;
}
-#define NBENCODE(c) (htole16((u_short)(((u_char)(c) >> 4) | \
- (((u_char)(c) & 0xf) << 8)) + 0x4141))
+static inline void
+nb_char_encode(u_char **ptr, u_char c, int n)
+{
-static void
-memsetw(char *dst, int n, u_short word)
-{
while (n--) {
- *(u_short*)dst = word;
- dst += 2;
+ *(*ptr)++ = 0x41 + (c >> 4);
+ *(*ptr)++ = 0x41 + (c & 0x0f);
}
}
@@ -165,19 +163,15 @@
*cp++ = NB_ENCNAMELEN;
name = np->nn_name;
if (name[0] == '*' && name[1] == 0) {
- *(u_short*)cp = NBENCODE('*');
- memsetw(cp + 2, NB_NAMELEN - 1, NBENCODE(' '));
- cp += NB_ENCNAMELEN;
+ nb_char_encode(&cp, '*', 1);
+ nb_char_encode(&cp, ' ', NB_NAMELEN - 1);
} else {
- for (i = 0; *name && i < NB_NAMELEN - 1; i++, cp += 2, name++)
- *(u_short*)cp = NBENCODE(toupper(*name));
- i = NB_NAMELEN - i - 1;
- if (i > 0) {
- memsetw(cp, i, NBENCODE(' '));
- cp += i * 2;
- }
- *(u_short*)cp = NBENCODE(np->nn_type);
- cp += 2;
+ for (i = 0; i < NB_NAMELEN - 1; i++)
+ if (*name != 0)
+ nb_char_encode(&cp, toupper(*name++), 1);
+ else
+ nb_char_encode(&cp, ' ', 1);
+ nb_char_encode(&cp, np->nn_type, 1);
}
*cp = 0;
if (np->nn_scope == NULL)
Modified: trunk/contrib/smbfs/lib/smb/nb_net.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/nb_net.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/nb_net.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nb_net.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/nb_net.c,v 1.4 2005/10/02 08:32:48 bp Exp $
+ * $Id: nb_net.c,v 1.4 2001/02/16 02:46:12 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/nb_net.c 150802 2005-10-02 08:32:49Z bp $
*/
#include <sys/param.h>
#include <sys/socket.h>
Modified: trunk/contrib/smbfs/lib/smb/nbns_rq.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/nbns_rq.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/nbns_rq.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nbns_rq.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/nbns_rq.c,v 1.2 2005/10/02 08:32:48 bp Exp $
+ * $Id: nbns_rq.c,v 1.5 2001/02/17 03:07:24 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/nbns_rq.c 150802 2005-10-02 08:32:49Z bp $
*/
#include <sys/param.h>
#include <sys/socket.h>
Modified: trunk/contrib/smbfs/lib/smb/nls.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/nls.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/nls.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,19 +29,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: nls.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+ * $Id: nls.c,v 1.10 2002/07/22 08:33:59 bp Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nls.c,v 1.2 2004/10/19 17:39:15 obrien Exp $");
+__FBSDID("$FreeBSD: stable/10/contrib/smbfs/lib/smb/nls.c 282275 2015-04-30 16:08:47Z tijl $");
#include <sys/types.h>
-#include <sys/iconv.h>
#include <sys/sysctl.h>
#include <ctype.h>
-#ifndef APPLE
-#include <dlfcn.h>
-#endif
#include <errno.h>
#include <stdio.h>
#include <string.h>
@@ -50,21 +46,16 @@
#include <err.h>
#include <netsmb/smb_lib.h>
-/*
- * prototype iconv* functions
- */
-typedef void *iconv_t;
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
-static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
-static int(*my_iconv_close)(iconv_t);
-
u_char nls_lower[256];
u_char nls_upper[256];
+#ifdef HAVE_ICONV
static iconv_t nls_toext, nls_toloc;
-static int iconv_loaded;
-static void *iconv_lib;
+#endif
int
nls_setlocale(const char *name)
@@ -85,59 +76,43 @@
int
nls_setrecode(const char *local, const char *external)
{
-#ifdef APPLE
- return ENOENT;
-#else
+#ifdef HAVE_ICONV
iconv_t icd;
- if (iconv_loaded == 2)
- return ENOENT;
- else if (iconv_loaded == 0) {
- iconv_loaded++;
- iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL);
- if (iconv_lib == NULL) {
- warn("Unable to load iconv library: %s\n", dlerror());
- iconv_loaded++;
- return ENOENT;
- }
- my_iconv_open = dlsym(iconv_lib, "iconv_open");
- my_iconv = dlsym(iconv_lib, "iconv");
- my_iconv_close = dlsym(iconv_lib, "iconv_close");
- }
if (nls_toext)
- my_iconv_close(nls_toext);
+ iconv_close(nls_toext);
if (nls_toloc)
- my_iconv_close(nls_toloc);
+ iconv_close(nls_toloc);
nls_toext = nls_toloc = (iconv_t)0;
- icd = my_iconv_open(external, local);
+ icd = iconv_open(external, local);
if (icd == (iconv_t)-1)
return errno;
nls_toext = icd;
- icd = my_iconv_open(local, external);
+ icd = iconv_open(local, external);
if (icd == (iconv_t)-1) {
- my_iconv_close(nls_toext);
+ iconv_close(nls_toext);
nls_toext = (iconv_t)0;
return errno;
}
nls_toloc = icd;
return 0;
+#else
+ return ENOENT;
#endif
}
char *
-nls_str_toloc(char *dst, const char *src)
+nls_str_toloc(char *dst, char *src)
{
+#ifdef HAVE_ICONV
char *p = dst;
size_t inlen, outlen;
- if (!iconv_loaded)
- return strcpy(dst, src);
-
if (nls_toloc == (iconv_t)0)
return strcpy(dst, src);
inlen = outlen = strlen(src);
- my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toloc, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
*p++ = *src++;
inlen--;
outlen--;
@@ -144,22 +119,23 @@
}
*p = 0;
return dst;
+#else
+ return strcpy(dst, src);
+#endif
}
char *
-nls_str_toext(char *dst, const char *src)
+nls_str_toext(char *dst, char *src)
{
+#ifdef HAVE_ICONV
char *p = dst;
size_t inlen, outlen;
- if (!iconv_loaded)
- return strcpy(dst, src);
-
if (nls_toext == (iconv_t)0)
return strcpy(dst, src);
inlen = outlen = strlen(src);
- my_iconv(nls_toext, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toext, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
*p++ = *src++;
inlen--;
outlen--;
@@ -166,18 +142,19 @@
}
*p = 0;
return dst;
+#else
+ return strcpy(dst, src);
+#endif
}
void *
-nls_mem_toloc(void *dst, const void *src, int size)
+nls_mem_toloc(void *dst, void *src, int size)
{
+#ifdef HAVE_ICONV
char *p = dst;
- const char *s = src;
+ char *s = src;
size_t inlen, outlen;
- if (!iconv_loaded)
- return memcpy(dst, src, size);
-
if (size == 0)
return NULL;
@@ -184,36 +161,43 @@
if (nls_toloc == (iconv_t)0)
return memcpy(dst, src, size);
inlen = outlen = size;
- my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toloc, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
*p++ = *s++;
inlen--;
outlen--;
}
return dst;
+#else
+ return memcpy(dst, src, size);
+#endif
}
void *
-nls_mem_toext(void *dst, const void *src, int size)
+nls_mem_toext(void *dst, void *src, int size)
{
+#ifdef HAVE_ICONV
char *p = dst;
- const char *s = src;
+ char *s = src;
size_t inlen, outlen;
if (size == 0)
return NULL;
- if (!iconv_loaded || nls_toext == (iconv_t)0)
+ if (nls_toext == (iconv_t)0)
return memcpy(dst, src, size);
inlen = outlen = size;
- my_iconv(nls_toext, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toext, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
*p++ = *s++;
inlen--;
outlen--;
}
return dst;
+#else
+ return memcpy(dst, src, size);
+#endif
}
char *
Modified: trunk/contrib/smbfs/lib/smb/print.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/print.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/print.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: print.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+ * $Id: print.c,v 1.4 2001/04/16 04:33:01 bp Exp $
*/
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -54,7 +54,7 @@
int
smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode,
- const char *ident, smbfh *fhp)
+ char *ident, smbfh *fhp)
{
struct smb_rq *rqp;
struct mbdata *mbp;
Modified: trunk/contrib/smbfs/lib/smb/rap.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/rap.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/rap.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: rap.c,v 1.1.1.3 2008-11-22 17:34:20 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.5 2005/09/19 08:07:18 imura Exp $
+ * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/rap.c 150312 2005-09-19 08:07:18Z imura $
*
* This is very simple implementation of RAP protocol.
*/
Modified: trunk/contrib/smbfs/lib/smb/rcfile.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/rcfile.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/rcfile.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: rcfile.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+ * $Id: rcfile.c,v 1.5 2001/04/16 12:46:46 bp Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/rcfile.c,v 1.2 2004/10/19 17:44:31 obrien Exp $");
+__FBSDID("$FreeBSD: stable/10/contrib/smbfs/lib/smb/rcfile.c 136700 2004-10-19 17:44:31Z obrien $");
#include <sys/types.h>
#include <sys/queue.h>
Modified: trunk/contrib/smbfs/lib/smb/rq.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/rq.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/rq.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,8 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: rq.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.3 2004/10/19 17:44:31 obrien Exp $
+ * $Id: rq.c,v 1.7 2001/04/16 04:33:01 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/lib/smb/rq.c 282275 2015-04-30 16:08:47Z tijl $
*/
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -86,7 +86,7 @@
}
int
-smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size)
+smb_rq_dmem(struct mbdata *mbp, char *src, size_t size)
{
struct mbuf *m;
char * dst;
@@ -118,7 +118,7 @@
}
int
-smb_rq_dstring(struct mbdata *mbp, const char *s)
+smb_rq_dstring(struct mbdata *mbp, char *s)
{
return smb_rq_dmem(mbp, s, strlen(s) + 1);
}
Modified: trunk/contrib/smbfs/lib/smb/subr.c
===================================================================
--- trunk/contrib/smbfs/lib/smb/subr.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/lib/smb/subr.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: subr.c,v 1.2 2009-10-09 02:43:50 laffer1 Exp $
+ * $Id: subr.c,v 1.12 2001/08/22 03:31:37 bp Exp $
*/
#include <sys/param.h>
@@ -74,7 +74,7 @@
if (smblib_initialized)
return 0;
-#if (defined(__MidnightBSD_version) || __FreeBSD_version > 400000)
+#if __FreeBSD_version > 400000
error = sysctlbyname("net.smb.version", &kv, &kvlen, NULL, 0);
if (error) {
warnx("%s: can't find kernel module\n", __FUNCTION__);
@@ -232,6 +232,8 @@
islower(ch) ? ('a' + (ch - 'a' + 13) % 26) : ch);
ch ^= pos;
pos += 13;
+ if (pos > 256)
+ pos -= 256;
sprintf(dst, "%02x", ch);
dst += 2;
}
@@ -262,6 +264,8 @@
return EINVAL;
ch ^= pos;
pos += 13;
+ if (pos > 256)
+ pos -= 256;
if (isascii(ch))
ch = (isupper(ch) ? ('A' + (ch - 'A' + 13) % 26) :
islower(ch) ? ('a' + (ch - 'a' + 13) % 26) : ch);
Modified: trunk/contrib/smbfs/mount_smbfs/mount_smbfs.8
===================================================================
--- trunk/contrib/smbfs/mount_smbfs/mount_smbfs.8 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/mount_smbfs/mount_smbfs.8 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,5 +1,5 @@
-.\" $Id: mount_smbfs.8,v 1.2 2013-08-24 12:03:40 laffer1 Exp $
-.\" $MidnightBSD$
+.\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $
+.\" $FreeBSD: stable/10/contrib/smbfs/mount_smbfs/mount_smbfs.8 225644 2011-09-17 22:53:05Z delphij $
.Dd September 17, 2011
.Dt MOUNT_SMBFS 8
.Os
Modified: trunk/contrib/smbfs/mount_smbfs/mount_smbfs.c
===================================================================
--- trunk/contrib/smbfs/mount_smbfs/mount_smbfs.c 2018-06-27 12:50:13 UTC (rev 11154)
+++ trunk/contrib/smbfs/mount_smbfs/mount_smbfs.c 2018-06-27 12:50:57 UTC (rev 11155)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2000-2002, Boris Popov
* All rights reserved.
@@ -29,8 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mount_smbfs.c,v 1.2 2013-08-24 12:03:40 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
+ * $FreeBSD: stable/10/contrib/smbfs/mount_smbfs/mount_smbfs.c 272118 2014-09-25 17:47:26Z trasz $
*/
#include <sys/param.h>
#include <sys/stat.h>
@@ -81,8 +82,8 @@
#else
struct xvfsconf vfc;
#endif
- char *next;
- int opt, error, mntflags, caseopt, dev;
+ char *next, *p, *val;
+ int opt, error, mntflags, caseopt, fd;
uid_t uid;
gid_t gid;
mode_t dir_mode, file_mode;
@@ -90,7 +91,7 @@
iov = NULL;
iovlen = 0;
- dev = 0;
+ fd = 0;
uid = (uid_t)-1;
gid = (gid_t)-1;
caseopt = 0;
@@ -194,6 +195,13 @@
};
case 'o':
getmntopts(optarg, mopts, &mntflags, 0);
+ p = strchr(optarg, '=');
+ val = NULL;
+ if (p != NULL) {
+ *p = '\0';
+ val = p + 1;
+ }
+ build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
break;
case 'c':
switch (optarg[0]) {
@@ -266,11 +274,11 @@
exit(1);
}
- dev = ctx->ct_fd;
+ fd = ctx->ct_fd;
build_iovec(&iov, &iovlen, "fstype", strdup("smbfs"), -1);
build_iovec(&iov, &iovlen, "fspath", mount_point, -1);
- build_iovec_argf(&iov, &iovlen, "dev", "%d", dev);
+ build_iovec_argf(&iov, &iovlen, "fd", "%d", fd);
build_iovec(&iov, &iovlen, "mountpoint", mount_point, -1);
build_iovec_argf(&iov, &iovlen, "uid", "%d", uid);
build_iovec_argf(&iov, &iovlen, "gid", "%d", gid);
More information about the Midnightbsd-cvs
mailing list