From f6aee2e409dbba4abcb5819b0eb2705b4f506d41 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 11 Feb 2016 10:47:58 +0100 Subject: [PATCH 1/2] s4-client: Fix cifsdd arg parsing for skip BUG: https://bugzilla.samba.org/show_bug.cgi?id=11730 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner (cherry picked from commit 23d2c7f6707fee14330881c341249d6ce766dda0) --- source4/client/cifsdd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.7.1 From 910a72ae7c94162f8c089e0ea605ccf5259d18c4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 11 Feb 2016 10:49:39 +0100 Subject: [PATCH 2/2] docs: Add manpage for cifsdd BUG: https://bugzilla.samba.org/show_bug.cgi?id=11730 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner (cherry picked from commit a5e349a5ffaba56c47dc73b809b427f17abe1c65) --- docs-xml/manpages/cifsdd.8.xml | 101 +++++++++++++++++++++++++++++++++++++++++ docs-xml/wscript_build | 1 + 2 files changed, 102 insertions(+) create mode 100644 docs-xml/manpages/cifsdd.8.xml 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 @@ + + + + + + cifsdd + 8 + Samba + System Administration tools + 4.4 + + + + + cifsdd + convert and copy a file over SMB + + + + + cifsdd + OPERAND... + + + cifsdd + OPTION + + + + + DESCRIPTION + + This tool is part of the samba + 7 suite. + + Copy a file, converting and formatting according to the operands. + + + + bs=BYTES + read and write up to BYTES bytes at a time (default: 4096) + + + ibs=BYTES + read up to BYTES bytes at a time (default: 4096) + + + obs=BYTES + write BYTES bytes at a time (default: 4096) + + + + if=FILE + read from FILE instead of stdin + + + of=FILE + write to FILE instead of stdout + + + + count=N + copy only N input blocks + + + seek=N + skip N obs-sized blocks at start of output + + + skip=N + skip N ibs-sized blocks at start of input + + + + direct + use direct I/O for data + + + sync + use synchronous writes + + + oplock + take oplocks on the input and output files + + + + + + AUTHOR + + 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. + + The cifsdd manpage was written by Andreas + Schneider. + + + 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 -- 2.7.1