The branch, master has been updated
via a5e349a docs: Add manpage for cifsdd
via 23d2c7f s4-client: Fix cifsdd arg parsing for skip
via 0ae75b0 examples: Fix script interpreter line
from 833a2f4 lib: tevent: Fix memory leak reported by Pavel Březina
<pbrez...@redhat.com> when old signal action restored.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a5e349a5ffaba56c47dc73b809b427f17abe1c65
Author: Andreas Schneider <a...@samba.org>
Date: Thu Feb 11 10:49:39 2016 +0100
docs: Add manpage for cifsdd
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11730
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
Autobuild-User(master): Günther Deschner <g...@samba.org>
Autobuild-Date(master): Thu Feb 18 18:05:55 CET 2016 on sn-devel-144
commit 23d2c7f6707fee14330881c341249d6ce766dda0
Author: Andreas Schneider <a...@samba.org>
Date: Thu Feb 11 10:47:58 2016 +0100
s4-client: Fix cifsdd arg parsing for skip
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11730
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
commit 0ae75b04237bafbb6e4fbc04665cf79f3c4340df
Author: Andreas Schneider <a...@samba.org>
Date: Thu Feb 11 10:06:43 2016 +0100
examples: Fix script interpreter line
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/cifsdd.8.xml | 101 +++++++++++++++++++++++++++++++++++++++++
docs-xml/wscript_build | 1 +
examples/misc/wall.perl | 2 +-
source4/client/cifsdd.c | 2 +-
4 files changed, 104 insertions(+), 2 deletions(-)
create mode 100644 docs-xml/manpages/cifsdd.8.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/cifsdd.8.xml b/docs-xml/manpages/cifsdd.8.xml
new file mode 100644
index 0000000..572ed7b
--- /dev/null
+++ b/docs-xml/manpages/cifsdd.8.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant
V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc";>
+<refentry id="smbspool.8">
+
+<refmeta>
+ <refentrytitle>cifsdd</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.4</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>cifsdd</refname>
+ <refpurpose>convert and copy a file over SMB</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>cifsdd</command>
+ <arg choice="opt">OPERAND</arg>...
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>cifsdd</command>
+ <arg choice="plain">OPTION</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the
<citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>Copy a file, converting and formatting according to the
operands.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>bs=BYTES</term>
+ <listitem><para>read and write up to BYTES bytes at a
time (default: 4096)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ibs=BYTES</term>
+ <listitem><para>read up to BYTES bytes at a time
(default: 4096)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>obs=BYTES</term>
+ <listitem><para>write BYTES bytes at a time (default:
4096)</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>if=FILE</term>
+ <listitem><para>read from FILE instead of
stdin</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>of=FILE</term>
+ <listitem><para>write to FILE instead of
stdout</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>count=N</term>
+ <listitem><para>copy only N input
blocks</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>seek=N</term>
+ <listitem><para>skip N obs-sized blocks at start of
output</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>skip=N</term>
+ <listitem><para>skip N ibs-sized blocks at start of
input</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>direct</term>
+ <listitem><para>use direct I/O for
data</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>sync</term>
+ <listitem><para>use synchronous writes</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>oplock</term>
+ <listitem><para>take oplocks on the input and output
files</para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>The cifsdd manpage was written by Andreas
+ Schneider.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 3a87ad1..11b826b 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -1,6 +1,7 @@
#!/usr/bin/env python
from samba_utils import save_file
manpages='''
+ manpages/cifsdd.8
manpages/dbwrap_tool.1
manpages/eventlogadm.8
manpages/findsmb.1
diff --git a/examples/misc/wall.perl b/examples/misc/wall.perl
index 9303658..efa4ee5 100644
--- a/examples/misc/wall.perl
+++ b/examples/misc/wall.perl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#! /usr/bin/env perl
#
#@(#) smb-wall.pl Description:
#@(#) A perl script which allows you to announce whatever you choose to
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 7d412a5..48ffe18 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -571,7 +571,7 @@ int main(int argc, const char ** argv)
/* Block counts. */
set_arg_val("count", (uint64_t)-1);
set_arg_val("seek", (uint64_t)0);
- set_arg_val("seek", (uint64_t)0);
+ set_arg_val("skip", (uint64_t)0);
/* Files. */
set_arg_val("if", NULL);
set_arg_val("of", NULL);
--
Samba Shared Repository
