Fixes to compile on CentOS 8 - thanks to Torsten for providing this patch

SSL libraries missing and image not that much smaller.

.dockerignore

@@ -0,0 +1,4 @@
+.git/
+lib/
+scripts/
+test/

.gitlab-ci.yml

@@ -0,0 +1,95 @@
+stages:
+- build
+- test
+- docker
+
+# For some reason compiling on CentOS 6.x results in buffer corruption
+build:6-7.1:
+  stage: build
+  image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1
+  script:
+  - make -f Makefile.linux64
+  only:
+  - c6
+  tags:
+  - C
+  - x86_64
+  artifacts:
+    name: "$CI_BUILD_NAME"
+    paths:
+    - tsmpipe
+
+test:6-7.1:
+  stage: test
+  image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1
+  dependencies:
+  - build:6-7.1
+  script:
+  - cd test && ./test.sh
+  only:
+  - c6
+  tags:
+  - C
+  - x86_64
+
+# Compile on CentOS 6.x, for some reason compiling on CentOS 7.x results in buffer corruption
+build:7-8.1:
+  stage: build
+  image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1
+  script:
+  - make -f Makefile.linux64
+  only:
+  - master
+  tags:
+  - C
+  - x86_64
+  artifacts:
+    name: "$CI_BUILD_NAME"
+    paths:
+    - tsmpipe
+
+test:7-8.1:
+  stage: test
+  image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1
+  dependencies:
+  - build:7-8.1
+  script:
+  - cd test && ./test.sh
+  only:
+  - master
+  tags:
+  - C
+  - x86_64
+  artifacts:
+    name: "$CI_BUILD_NAME"
+    paths:
+    - tsmpipe
+
+docker:7-8.1:
+  stage: docker
+  image: docker:latest
+  services:
+  - docker:dind
+
+  before_script:
+  - docker info
+  - docker version
+  - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
+  variables:
+    CACHETAG: build
+    VERSION: 8.1.7
+    DOCKER_HOST: tcp://docker:2375
+  dependencies:
+  - test:7-8.1
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
+  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
+  - docker run ${CI_REGISTRY_IMAGE}:${VERSION} -h
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+  tags:
+  - docker
+  - x86_64
+  only:
+  - master

Dockerfile

@@ -0,0 +1,26 @@
+# NAME deon/tsmpipe
+# VERSION 8.1.7
+
+FROM centos:7
+
+# If using FTP source (change tar to not use z)
+#RUN SOURCE_URL=ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v812/8.1.2.0-TIV-TSMBAC-LinuxX86.tar \
+
+# If using PPA source
+RUN SOURCE_URL=http://yum.leenooks.vpn/docker/tsm/8.x/SP_CLIENT_8.1.7_LIN86_ML.tar.gz \
+	&& PREFIX=TSMCLI_LNX/tsmcli/linux86 \
+	&& CHARS=$(echo ${PREFIX} | awk -F"/" '{print NF}') \
+	&& curl -SL ${SOURCE_URL} | tar -zC /tmp/ --strip-components ${CHARS} -xf - ${PREFIX}/gskcrypt64-*.linux.x86_64.rpm ${PREFIX}/gskssl64-*.linux.x86_64.rpm ${PREFIX}/TIVsm-API64.x86_64.rpm \
+	&& yum install -y /tmp/*rpm && rm -rf /tmp/*rpm /var/cache/yum
+
+RUN ln -s /tsm/dsm.sys /opt/tivoli/tsm/client/api/bin64/ \
+	&& ln -s /tsm/dsm.opt /opt/tivoli/tsm/client/api/bin64/ \
+	&& ln -s /tsm/dsmcert.kdb /opt/tivoli/tsm/client/api/bin64/ \
+	&& ln -s /tsm/dsmcert.sth /opt/tivoli/tsm/client/api/bin64/
+
+COPY tsmpipe /usr/bin
+
+VOLUME [ "/tsm" ]
+
+# Starting
+ENTRYPOINT [ "/usr/bin/tsmpipe" ]

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    tsmpipe
+    Copyright (C) 2016  Deon George
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    tsmpipe  Copyright (C) 2016  Deon George
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Makefile.linux64

@@ -2,7 +2,7 @@ TSMAPIDIR=/opt/tivoli/tsm/client/api/bin64/sample
 
 # ** For Digest Calculations, we need to link to openssl libraries, and enable USE_DIGEST in tsmpipe.h **
 #TSMLIB=-lApiTSM64
-TSMLIB=-lApiTSM64 -lssl
+TSMLIB=-lApiTSM64 -lssl -lcrypto
 
 CC=gcc
 CFLAGS=-g -W -Wall -Wextra -O -m64 -I$(TSMAPIDIR)

README.md

@@ -0,0 +1,40 @@
+# About
+TSMPIPE is a Tivoli Storage Manager (TSM) or now known as Spectrum Protect client, that enables you to take data from STDIN and store that in TSM as a BACKUP or ARCHIVE object.
+By using this client, you dont need to do a dump to disk process, followed by using the Spectrum Protect Backup Archive Client. (So no more consuming disk space with old dumps!)
+
+Restoring data, is the reverse step, restoring directly back to the application from Spectrum Protect.
+
+# Using
+In its simplest form, you can
+```cat myfile.ext | tsmpipe -c [MORE OPTIONS]```
+
+Or, where an application supports "dumping" to STDOUT, you can pipe that dump into TSMPIPE.
+```myappdump | tsmpipe -c [OPTIONS]```
+
+Getting data back is the reverse
+```tsmpipe -x [MORE OPTIONS] > myfile```
+
+Or, back to your application
+```tsmpipe -x [MORE OPTIONS] | myapp```
+
+This client can also calculate a digest while backuping up data (like MD5, SHA1, etc) - so that you can verify that the dump out of the application matches what goes into
+Spectrum Protect. For example:
+
+```
+myappdump > file
+md5sum file
+cat file | tsmpipe -cBs /example/ -f file -m md5
+tsmpipe -xBs /example/ -f file > file2
+md5sum file2
+```
+
+The MD5 calculation should match in all cases - including the MD5 printed by tsmpipe. See the build test script for more details.
+# Building
+Building TSMPIPE is hopefully relatively easy - it's currently only tested on Linux (specifically CentOS), but it should be buildable on other Spectrum Protect
+supported platforms, however you may need to create an appropriate Makefile.
+
+Here is a blog on building on Linux: https://thefrinkiac7.wordpress.com/data-protection/building-tsmpipe
+
+# Help
+For help, use tsmpipe -h
+To test that you can connect to TSM, use tsmpipe -i

lib/dsmlist.c

@@ -12,28 +12,66 @@
 
 dsBool_t headerPrinted=bFalse; // Have we rendered the heading row yet
 
+char *units(double size) {
+	extern int verbose;
+	static const char *SIZES[] = { "B", "KiB", "MiB", "GiB" };
+	int div = 0;
+	double rem = 0;
+	int base = 1024;
+	int s_size = 128;
+
+	char *s;
+
+	s = "\0";
+	s = malloc(s_size);
+        if (s==NULL) {
+                perror("Arg, out of memory?");
+                exit(255);
+        }
+	memset(s,0x00,s_size);
+
+	while (size >= base && div < (int)(sizeof SIZES / sizeof *SIZES)-1) {
+		if (verbose > 2)
+			fprintf(stderr,"%s: BEFORE - SIZE: [%3.2f], DIV: [%d], REM: [%3.2f]\n",__func__,size,div,rem);
+
+		rem = ((int)size % base);
+		size /= base;
+		div++;
+	}
+
+	if (verbose > 2)
+		fprintf(stderr,"%s: AFTER - SIZE: [%3.2f], DIV: [%d], REM: [%3.2f]\n",__func__,size,div,rem);
+
+	sprintf(s,"%3.2f %s",size,SIZES[div]);
+
+	return s;
+}
+
 /*
  * Our Callback to show what is in TSM
  */
-int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
+int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata, dsBool_t friendly) {
+	extern int verbose;
 	char stor[2];
 	char state[3];
 	char ced[4];
 	char objInfo[DSM_MAX_OBJINFO_LENGTH];
+	char *s;
+	s = malloc(1024);
 
 	if (userdata != NULL ) {
-		fprintf(stderr, "tsm_listfile_cb: Internal error: userdata != NULL");
+		debugLog(0,__func__,"ERROR: Internal error: userdata != NULL",0);
 		return -1;
 	}
 
 	if (qType == qtArchive) {
 		if (! headerPrinted++) {
-			printf("%40s %2s %s %3s %19s %19s %10s %10s %10s",
+			printf("%-40s %2s %s %3s %-19s %-19s %12s %-10s %-10s",
 				"NAME",
 				"ST",
 				"L",
 				"CED",
-				"BACKUP",
+				"ARCHIVE",
 				"EXPIRE",
 				"SIZE",
 				"ID",
@@ -74,12 +112,18 @@ int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
 
 		strcat(ced,respArchive.clientDeduplicated ? "D" : "-");
 
+		if (friendly) {
+			s = units((double)dsmSizeToNum(respArchive.sizeEstimate,bFalse));
+		} else {
+			sprintf(s,"%7.3f MB",dsmSizeToNum(respArchive.sizeEstimate,bTrue));
+		}
+
 		// The Object Status
-		printf("%40s|%2s|%s|%3s|%19s|%19s|%7.3f MB|%u-%u|%s",dsmObjnameToStr(respArchive.objName),state,stor,ced,dsmDateToStr(respArchive.insDate),respArchive.expDate.year ? dsmDateToStr(respArchive.expDate) : "",dsmSizeToNum(respArchive.sizeEstimate,bTrue),respArchive.objId.hi,respArchive.objId.lo,respArchive.descr);
+		printf("%-40s|%2s|%s|%3s|%-19s|%-19s|%12s|%u-%8u|%10s",dsmObjnameToStr(respArchive.objName),state,stor,ced,dsmDateToStr(respArchive.insDate),respArchive.expDate.year ? dsmDateToStr(respArchive.expDate) : "",s,respArchive.objId.hi,respArchive.objId.lo,respArchive.descr);
 
 	} else if (qType == qtBackup) {
 		if (! headerPrinted++) {
-			printf("%40s %2s %s %3s %19s %19s %10s %10s",
+			printf("%-40s %2s %s %3s %-19s %-19s %12s %-10s",
 				"NAME",
 				"ST",
 				"L",
@@ -130,6 +174,8 @@ int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
 			(respBackup.encryptionType & DSM_ENCRYPT_USER ? "U" : "-")));
 
 		strcat(ced,respBackup.clientDeduplicated ? "D" : "-");
+	if (verbose > 2)
+		fprintf(stderr,"%s: clientDeduplicated: %d\n",__func__,respBackup.clientDeduplicated);
 
 #ifdef USE_DIGEST
 		// Object Info
@@ -139,9 +185,15 @@ int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
 			strncat(objInfo,respBackup.objInfo,respBackup.objInfolen);
 #endif
 
-		printf("%40s|%2s|%s|%3s|%19s|%19s|%7.3f MB|%u-%8u",dsmObjnameToStr(respBackup.objName),state,stor,ced,dsmDateToStr(respBackup.insDate),respBackup.expDate.year ? dsmDateToStr(respBackup.expDate) : "",dsmSizeToNum(respBackup.sizeEstimate,bTrue),respBackup.objId.hi,respBackup.objId.lo);
+		if (friendly) {
+			s = units((double)dsmSizeToNum(respBackup.sizeEstimate,bFalse));
 		} else {
-		fprintf(stderr,"tsm_listfile_cb: Internal error: Unknown qType %d\n",qType);
+			sprintf(s,"%7.3f MB",dsmSizeToNum(respBackup.sizeEstimate,bTrue));
+		}
+
+		printf("%-40s|%2s|%s|%3s|%19s|%19s|%12s|%u-%8u",dsmObjnameToStr(respBackup.objName),state,stor,ced,dsmDateToStr(respBackup.insDate),respBackup.expDate.year ? dsmDateToStr(respBackup.expDate) : "",s,respBackup.objId.hi,respBackup.objId.lo);
+	} else {
+		fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 		return -1;
 	}
 
@@ -156,10 +208,10 @@ int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
 /*
  * List objects that are in TSM
  */
-int tsm_listfile(dsUint32_t sesshandle, dsmQueryType qType, qryArchiveData qaData, qryBackupData qbData) {
+int tsm_listfile(dsUint32_t sesshandle, dsmQueryType qType, qryArchiveData qaData, qryBackupData qbData, dsBool_t friendly) {
 	dsInt16_t rc=0;
 
-	rc = tsm_queryfile(sesshandle,qType,tsm_listfile_cb,NULL,qaData,qbData);
+	rc = tsm_queryfile(sesshandle,qType,tsm_listfile_cb,NULL,qaData,qbData,friendly);
 
 	if (rc != DSM_RC_OK && rc != DSM_RC_ABORT_NO_MATCH)
 		return 0;

lib/dsmobjects.c

@@ -72,14 +72,16 @@ dsmDate dsmStrToDate(char *s) {
 char *dsmDateToStr(dsmDate date) {
 	char *s;
 
-	s = malloc(19);
+	int s_size = 32;
+
+	s = malloc(s_size);
 
 	if (s==NULL) {
 		perror("Arg, out of memory?");
 		exit(255);
 	}
 
-	memset(s,0x00,sizeof(s));
+	memset(s,0x00,s_size);
 
 	sprintf(s,"%04i-%02i-%02i %02i:%02i:%02i",
 		date.year,
@@ -107,7 +109,7 @@ dsmObjName dsmNameToObjname(char *fsname, char *filename) {
 	memset(objname,0x00,sizeof(dsmObjName));
 
 	if (verbose)
-		fprintf(stderr,"dsmNameToObjname: FS: %s Filename: %s\n",fsname,filename);
+		fprintf(stderr,"%s: FS: %s Filename: %s\n",__func__,fsname,filename);
 
 	/* fs == "/filesystem", hl == "/directory/path", ll == "/filename" */
 	strcpy(objname->fs,fsname);
@@ -145,7 +147,7 @@ char *dsmObjnameToStr(dsmObjName objName) {
 		exit(255);
 	}
 
-	memset(s,0x00,sizeof(s));
+	memset(s,0x00,sizeof(dsmObjName));
 
 	sprintf(s,"%s%s%s",objName.fs,objName.hl,objName.ll);
 
@@ -153,25 +155,27 @@ char *dsmObjnameToStr(dsmObjName objName) {
 }
 
 double dsmSizeToNum(dsStruct64_t dsStruct64,dsBool_t inMB) {
-	unsigned long long filesize=0;
-
-	filesize = 0x00;
+	unsigned long long filesize;
+	extern int verbose;
 
 	filesize = dsStruct64.hi;
 	filesize <<= 32;
 	filesize |= dsStruct64.lo;
 
+	if (verbose)
+		fprintf(stderr,"%s: Size: %d\n",__func__,(int)filesize);
+
 	// Return number in MB
-	return (float) inMB ? filesize/1024/1024 : filesize;
+	return inMB ? (double)filesize/1024/1024 : (double)filesize;
 }
 
-void debugLog(int level, _IO_FILE *output, char *message, int die) {
+void debugLog(int level, const char *func, char *message, int die) {
 	extern int verbose;
 
 	if (level > verbose)
 		return;
 
-	fprintf(output,"%s\n",message);
+	fprintf(stderr,"%s: %s\n",func,message);
 
 	if (die)
 		exit(die);

lib/dsmsendrecv.c

@@ -16,9 +16,12 @@
 
 #include "../tsmpipe.h"
 
-int tsm_matchone_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
+int tsm_matchone_cb(dsmQueryType qType, DataBlk *qResp, void *userdata, dsmBool_t friendly) {
 	struct matchone_cb_data *cbdata = userdata;
 
+	if (friendly)
+		debugLog(0,__func__,"ERROR: Friendly is set?",1);
+
 	cbdata->numfound++;
 
 	if (qType == qtArchive) {
@@ -33,12 +36,12 @@ int tsm_matchone_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
 		cbdata->copyGroup = qr->copyGroup;
 
 	} else {
-		fprintf(stderr,"tsm_matchone_cb: Internal error: Unknown qType %d\n",qType);
+		fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 		return -1;
 	}
 
 	if (cbdata->numfound > 1) {
-		fprintf(stderr,"tsm_matchone_cb: FAILED: The file specification matched multiple files.\n");
+		debugLog(0,__func__,"FAILED: The file specification matched multiple files.",0);
 		return -1;
 	}
 
@@ -48,10 +51,9 @@ int tsm_matchone_cb(dsmQueryType qType, DataBlk *qResp, void *userdata) {
 /* Read/Write a buffer full of data from file descripter */
 ssize_t rw_full(int fd, void *buf, size_t count) {
 	ssize_t done=0;
+	ssize_t len=0;
 
 	while (count) {
-		ssize_t len;
-
 		if (fd == STDIN_FILENO) {
 			len = read(fd,buf+done,count);
 
@@ -59,8 +61,7 @@ ssize_t rw_full(int fd, void *buf, size_t count) {
 			len = write(fd,buf+done,count);
 
 		} else {
-			fprintf(stderr,"rw_full: rw_full: Unknown FD\n");
-			exit(4);
+			debugLog(0,__func__,"ERROR: Unknown FD",4);
 		}
 
 		if (len == 0) {
@@ -82,7 +83,7 @@ ssize_t rw_full(int fd, void *buf, size_t count) {
 		done += len;
 	}
 
-	return(done);
+	return done;
 }
 
 /* Register a filespace in TSM */
@@ -98,7 +99,7 @@ int tsm_regfs(dsUint32_t dsmHandle, char *fsname) {
 	rc = dsmRegisterFS(dsmHandle,&regFS);
 
 	if (rc != DSM_RC_OK && rc != DSM_RC_FS_ALREADY_REGED) {
-		tsm_printerr(dsmHandle,rc,"tsm_regfs: dsmRegisterFS failed");
+		printf("%s: dsmRegisterFS() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -132,10 +133,11 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 
 #ifdef USE_DIGEST
 	char digest_str[EVP_MAX_MD_SIZE*2];
-	EVP_MD_CTX mdctx;
+	EVP_MD_CTX *mdctx;
 	const EVP_MD *md=NULL;
 	unsigned char md_value[EVP_MAX_MD_SIZE];
 	unsigned int md_len, i;
+	mdctx = NULL;
 
 	if (digest) {
 		OpenSSL_add_all_digests();
@@ -143,7 +145,7 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 		md = EVP_get_digestbyname(digest);
 
 		if (! md) {
-			printf("tsm_sendfile: Unknown message digest %s\n", digest);
+			printf("%s: Unknown message digest %s\n",__func__,digest);
 			return 0;
 		}
 	}
@@ -156,7 +158,7 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 
 	// Warn if we wont do compression
 	if (verbose && compressEnabled && length <= DSM_MIN_COMPRESS_SIZE)
-		fprintf(stderr,"tsm_sendfile: WARNING: Size (%i) too small for compression/de-duplication, even though it is enabled",(int)length);
+		fprintf(stderr,"%s: WARNING: Size (%i) too small for compression/de-duplication, even though it is enabled",__func__,(int)length);
 
 	// Log start backup
 	if (startstop)
@@ -165,7 +167,7 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 	// Start a Transaction
 	rc = dsmBeginTxn(dsmHandle);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_sendfile: dsmBeginTxn failed");
+		printf("%s: dsmBeginTxn() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -173,20 +175,20 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 	objName = dsmNameToObjname(fsname,filename);
 
 	if (verbose)
-		fprintf(stderr,"tsm_sendfile: Starting to send stdin as %s\n",dsmObjnameToStr(objName));
+		fprintf(stderr,"%s: Starting to send stdin as %s\n",__func__,dsmObjnameToStr(objName));
 
 	memset(&mcBindKey,0x00,sizeof(mcBindKey));
 	mcBindKey.stVersion = mcBindKeyVersion;
 	rc = dsmBindMC(dsmHandle,&objName,sendtype,&mcBindKey);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_sendfile: dsmBindMC failed");
+		printf("%s: dsmBindMC() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
 	if (verbose > 1) {
 		char *cgdest=NULL;
 
-		fprintf(stderr,"tsm_sendfile: Bound to Management Class: %s\n",mcBindKey.mcName);
+		fprintf(stderr,"%s: Bound to Management Class: %s\n",__func__,mcBindKey.mcName);
 
 		if ((sendtype == stArchiveMountWait || sendtype == stArchive) && mcBindKey.archive_cg_exists) {
 			cgdest = mcBindKey.archive_copy_dest;
@@ -195,12 +197,12 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 			cgdest = mcBindKey.backup_copy_dest;
 
 		} else {
-			fprintf(stderr,"tsm_sendfile: Internal error: Unknown qType %d\n",sendtype);
+			fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,sendtype);
 			return -1;
 		}
 
 		if (cgdest)
-			fprintf(stderr,"tsm_sendfile: Destination Copy Group: %s\n",cgdest);
+			fprintf(stderr,"%s: Destination Copy Group: %s\n",__func__,cgdest);
 	}
 
 	memset(&objAttr,0x00,sizeof(ObjAttr));
@@ -222,14 +224,14 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 
 	rc = dsmSendObj(dsmHandle,sendtype,archDataP,&objName,&objAttr,NULL);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_sendfile: dsmSendObj failed");
+		printf("%s: dsmSendObj() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return(0);
 	}
 
 #ifdef USE_DIGEST
 	if (digest) {
-		EVP_MD_CTX_init(&mdctx);
-		EVP_DigestInit_ex(&mdctx, md, NULL);
+		mdctx = EVP_MD_CTX_new();
+		EVP_DigestInit_ex(mdctx, md, NULL);
 	}
 #endif
 
@@ -249,7 +251,7 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 
 #ifdef USE_DIGEST
 		if (digest)
-			EVP_DigestUpdate(&mdctx, buffer, nbytes);
+			EVP_DigestUpdate(mdctx, buffer, nbytes);
 #endif
 
 		dataBlk.bufferLen = nbytes;
@@ -259,7 +261,7 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 		rc = dsmSendData(dsmHandle,&dataBlk);
 
 		if (rc != DSM_RC_OK && rc != DSM_RC_COMPRESS_GREW) {
-			tsm_printerr(dsmHandle,rc,"tsm_sendfile: dsmSendData failed");
+			printf("%s: dsmSendData() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 			return 0;
 		}
 	}
@@ -272,31 +274,31 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 	dsmEndSendObjExOut.stVersion = dsmEndSendObjExOutVersion;
 
 	if ((rc = dsmEndSendObjEx(&dsmEndSendObjExIn,&dsmEndSendObjExOut)) != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_sendfile: dsmEndSendObjEx failed");
+		printf("%s: dsmEndSendObjEx() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
 	rc = dsmEndTxn(dsmHandle,DSM_VOTE_COMMIT,&reason);
 	if (rc == DSM_RC_CHECK_REASON_CODE || (rc == DSM_RC_OK && reason != DSM_RC_OK)) {
-		tsm_printerr(dsmHandle,reason,"tsm_sendfile: dsmEndTxn failed, reason");
+		printf("%s: dsmEndTxn() failed %s\n",__func__,tsm_printerr(dsmHandle,reason));
 		return 0;
 
 	} else if(rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_sendfile: dsmEndTxn failed");
+		printf("%s: dsmEndTxn() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
 #ifdef USE_DIGEST
 	if (digest) {
-		EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-		EVP_MD_CTX_cleanup(&mdctx);
+		EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+		EVP_MD_CTX_free(mdctx);
 
 		for(i=0; i<md_len; i++)
 			sprintf(digest_str+(i*2), "%02x", md_value[i]);
 
 		digest_str[strlen(digest_str)+1] = '\0';
 
-		fprintf(stdout,"%s  %s (%s)",digest_str,dsmObjnameToStr(objName),digest);
+		printf("%s  %s (%s)",digest_str,dsmObjnameToStr(objName),digest);
 	}
 
 	objAttr.objInfo=digest_str;
@@ -316,9 +318,9 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 
 	if (summary) {
 		if (! digest)
-			fprintf(stdout,"%s",dsmObjnameToStr(objName));
+			printf("%s",dsmObjnameToStr(objName));
 
-		fprintf(stdout,"  [%5.3f/%5.3f/%5.3f/%5.3f] (%s/%s)",
+		printf("  [%5.3f/%5.3f/%5.3f/%5.3f] (%s/%s)",
 			dsmSizeToNum(dsmEndSendObjExOut.totalBytesSent,bTrue),
 			dsmEndSendObjExOut.objDeduplicated ? dsmSizeToNum(dsmEndSendObjExOut.totalDedupSize,bTrue) : 0.0,
 			dsmEndSendObjExOut.objCompressed ? dsmSizeToNum(dsmEndSendObjExOut.totalCompressSize,bTrue) : 0.0,
@@ -328,7 +330,7 @@ double tsm_sendfile(dsUint32_t dsmHandle, char *fsname, char *filename, long lon
 	}
 
 	if (digest || summary)
-		fprintf(stdout,"\n");
+		printf("\n");
 
 	return dsmSizeToNum(dsmEndSendObjExOut.totalBytesSent,bFalse);
 }
@@ -341,26 +343,27 @@ int tsm_restorefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaD
 	dsmGetList getList;
 	DataBlk dataBlk;
 	dsmGetType gType;
+	dsmBool_t friendly=bFalse;
 
 	memset(&cbdata,0x00,sizeof(cbdata));
 	cbdata.numfound = 0;
 
 	if (qType == qtArchive) {
 		if (verbose)
-			fprintf(stderr,"tsm_restorefile: Starting to receive %s via stdin\n",dsmObjnameToStr(*qaData.objName));
+			fprintf(stderr,"%s: Starting to receive %s via stdin\n",__func__,dsmObjnameToStr(*qaData.objName));
 
 		gType = gtArchive;
-		rc = tsm_queryfile(dsmHandle,qType,tsm_matchone_cb,&cbdata,qaData,qbData);
+		rc = tsm_queryfile(dsmHandle,qType,tsm_matchone_cb,&cbdata,qaData,qbData,friendly);
 
 	} else if (qType == qtBackup) {
 		if (verbose)
-			fprintf(stderr,"tsm_restorefile: Starting to receive %s via stdin\n",dsmObjnameToStr(*qbData.objName));
+			fprintf(stderr,"%s: Starting to receive %s via stdin\n",__func__,dsmObjnameToStr(*qbData.objName));
 
 		gType = gtBackup;
-		rc = tsm_queryfile(dsmHandle,qType,tsm_matchone_cb,&cbdata,qaData,qbData);
+		rc = tsm_queryfile(dsmHandle,qType,tsm_matchone_cb,&cbdata,qaData,qbData,friendly);
 
 	} else {
-		fprintf(stderr,"tsm_restorefile: Internal error: Unknown qType %d\n",qType);
+		fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 		return -1;
 	}
 
@@ -368,7 +371,7 @@ int tsm_restorefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaD
 		return 0;
 
 	if (cbdata.numfound == 0) {
-		fprintf(stderr,"tsm_restorefile: FAILED: The file specification did not match any file.\n");
+		debugLog(0,__func__,"FAILED: The file specification did not match any file.",0);
 		return 0;
 	}
 
@@ -380,7 +383,7 @@ int tsm_restorefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaD
 
 	rc = dsmBeginGetData(dsmHandle,bTrue,gType,&getList);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_restorefile: dsmBeginGetData failed");
+		printf("%s: dsmBeginGetData() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -408,7 +411,7 @@ int tsm_restorefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaD
 	}
 
 	if (rc != DSM_RC_FINISHED) {
-		tsm_printerr(dsmHandle,rc,"tsm_restorefile: dsmGetObj/dsmGetData failed");
+		printf("%s: dsmGetObj()/dsmGetData() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -419,13 +422,13 @@ int tsm_restorefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaD
 
 	rc = dsmEndGetObj(dsmHandle);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_restorefile: dsmEndGetObj failed");
+		printf("%s: dsmEndGetObj() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
 	rc = dsmEndGetData(dsmHandle);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_restorefile: dsmEndGetData failed");
+		printf("%s: dsmEndGetData() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -437,71 +440,84 @@ int tsm_deletefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaDa
 	extern int verbose;
 	dsInt16_t rc=0;
 	dsUint16_t reason=0;
-	dsmDelInfo *dInfoP;
 	dsmDelType dType;
+	dsmDelInfo delInfo;
 	struct matchone_cb_data cbdata;
+	dsmBool_t friendly=bFalse;
 
 	cbdata.numfound = 0;
 
-	rc = tsm_queryfile(dsmHandle,qType,tsm_matchone_cb,&cbdata,qaData,qbData);
+	/** Our purge function uses qtReserved8 - this will break in a future release of the API **/
+	rc = tsm_queryfile(dsmHandle,((qType == qtBackup || qType == qtReserved8) ? qtBackup : qtArchive),tsm_matchone_cb,&cbdata,qaData,qbData,friendly);
 	if (rc != DSM_RC_OK) {
 		return 0;
 	}
 
 	if (cbdata.numfound == 0) {
-		fprintf(stderr,"tsm_deletefile: FAILED: The file specification did not match any file.\n");
+		debugLog(0,__func__,"FAILED: The file specification did not match any file.",0);
 		return 0;
 	}
 
 	if (qType == qtArchive) {
 		if (verbose)
-			fprintf(stderr,"tsm_deletefile: Deleting archive file %s\n",dsmObjnameToStr(*qaData.objName));
+			fprintf(stderr,"%s: Deleting archive file %s\n",__func__,dsmObjnameToStr(*qaData.objName));
 
 		dType = dtArchive;
 
-		delArch daInfo;
-		daInfo.stVersion = delArchVersion;
-		daInfo.objId = cbdata.objId;
-
-		dInfoP = (dsmDelInfo *) &daInfo;
+		delInfo.archInfo.stVersion = delArchVersion;
+		delInfo.archInfo.objId = cbdata.objId;
 
 	} else if (qType == qtBackup) {
 		if (verbose)
-			fprintf(stderr,"tsm_deletefile: Deleting backup file %s\n",dsmObjnameToStr(*qbData.objName));
+			fprintf(stderr,"%s: Deleting backup file %s with id [%u-%u]\n",__func__,dsmObjnameToStr(*qbData.objName),cbdata.objId.hi,cbdata.objId.lo);
 
 		dType = dtBackup;
 
-		delBack dbInfo;
-		dbInfo.stVersion = delBackVersion;
-		dbInfo.objNameP = qbData.objName;
-		dbInfo.copyGroup = cbdata.copyGroup;
+		dsmObjName objName;
+		memset(&objName,0x00,sizeof(objName));
+		strcpy(objName.fs,qbData.objName->fs);
+		strcpy(objName.hl,qbData.objName->hl);
+		strcpy(objName.ll,qbData.objName->ll);
+		objName.objType = DSM_OBJ_FILE;
 
-		dInfoP = (dsmDelInfo *) &dbInfo;
+		delInfo.backInfo.stVersion = delBackVersion;
+		delInfo.backInfo.objNameP = &objName;
+		delInfo.backInfo.copyGroup = cbdata.copyGroup;
+
+	/** Our purge function uses qtReserved8 - this will break in a future release of the API **/
+	} else if (qType == qtReserved8) {
+		if (verbose)
+			fprintf(stderr,"%s: Purging backup file %s with id [%u-%u]\n",__func__,dsmObjnameToStr(*qbData.objName),cbdata.objId.hi,cbdata.objId.lo);
+
+		dType = dtBackupID;
+
+		delInfo.backIDInfo.stVersion = delBackIDVersion;
+		delInfo.backIDInfo.objId = cbdata.objId;
 
 	} else {
-		fprintf(stderr,"tsm_matchone_cb: Internal error: Unknown qType %d\n",qType);
+		fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 		return -1;
 	}
 
 	rc = dsmBeginTxn(dsmHandle);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_deletefile: dsmBeginTxn failed");
+		printf("%s: dsmBeginTxn() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
-	rc = dsmDeleteObj(dsmHandle,dType,*dInfoP);
+	rc = dsmDeleteObj(dsmHandle,dType,delInfo);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_deletefile: dsmDeleteObj failed");
+		printf("%s: dsmDeleteObj() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
 	rc = dsmEndTxn(dsmHandle,DSM_VOTE_COMMIT,&reason);
 	if (rc == DSM_RC_CHECK_REASON_CODE || (rc == DSM_RC_OK && reason != DSM_RC_OK)) {
-		tsm_printerr(dsmHandle,reason,"tsm_deletefile: dsmEndTxn failed, reason");
+		printf("%s: dsmEndTxn() failed %s\n",__func__,tsm_printerr(dsmHandle,reason));
 		return 0;
 
 	} else if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_deletefile: dsmEndTxn failed");
+		printf("%s: dsmEndTxn() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -521,7 +537,7 @@ int tsm_updatefs(dsUint32_t dsmHandle, char *fsname, long long size) {
 	rc = dsmUpdateFS(dsmHandle,fsname,&fsUpdateP,DSM_FSUPD_OCCUPANCY | DSM_FSUPD_CAPACITY);
 
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_updatefs: dsmUpdateFS failed");
+		printf("%s: dsmUpdateFS() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 
@@ -536,7 +552,7 @@ int tsm_datefs(dsUint32_t dsmHandle, char *fsname, int startstop) {
 	rc = dsmUpdateFS(dsmHandle,fsname,&fsUpdateP,startstop);
 
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_datefs: dsmUpdateFS failed");
+		printf("%s: dsmUpdateFS() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return 0;
 	}
 

lib/dsmsession.c

@@ -6,6 +6,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
+#include <termio.h>
+#include <unistd.h>
 
 #include "dsmrc.h"
 #include "dsmapitd.h"
@@ -16,8 +19,11 @@
 dsBool_t compressEnabled=bFalse; // Is compression enabled
 
 /* Print out TSM Error Code */
-void tsm_printerr(dsUint32_t dsmHandle, dsInt16_t rc, char *str) {
+char *tsm_printerr(dsUint32_t dsmHandle, dsInt16_t rc) {
 	char rcStr[DSM_MAX_RC_MSG_LENGTH];
+	char *s;
+
+	s = malloc(DSM_MAX_RC_MSG_LENGTH+5);
 
 	if (rc == DSM_RC_WILL_ABORT) {
 		dsUint16_t reason;
@@ -30,7 +36,11 @@ void tsm_printerr(dsUint32_t dsmHandle, dsInt16_t rc, char *str) {
 
 	dsmRCMsg(dsmHandle,rc,rcStr);
 
-	fprintf(stderr, "tsmpipe: %s\n (rc=%s)\n",str,rcStr);
+	strtok(rcStr, "\n");
+
+	sprintf(s,"[rc=%s]",rcStr);
+
+	return s;
 }
 
 /* Check the TSM API Version */
@@ -65,10 +75,11 @@ int tsm_checkapi(void) {
 }
 
 /* Initialise a session to the TSM server */
-dsUint32_t tsm_initsess(char *options) {
+dsUint32_t tsm_initsess(char *options, char *password) {
 	dsInt16_t rc=0;
 	dsUint32_t dsmHandle=0;
 	dsmApiVersionEx applApi;
+	dsmAppVersion pipeApi;
 	dsmInitExIn_t initIn;
 	dsmInitExOut_t initOut;
 	optStruct dsmOpt;
@@ -85,17 +96,25 @@ dsUint32_t tsm_initsess(char *options) {
 	applApi.level     = DSM_API_LEVEL;
 	applApi.subLevel  = DSM_API_SUBLEVEL;
 
+	memset(&pipeApi,0x00,sizeof(dsmAppVersion));
+	pipeApi.stVersion = appVersionVer;
+	pipeApi.applicationVersion  = TSMPIPE_VERSION;
+	pipeApi.applicationRelease  = TSMPIPE_RELEASE;
+	pipeApi.applicationLevel    = TSMPIPE_LEVEL;
+	pipeApi.applicationSubLevel = TSMPIPE_SUBLEVEL;
+
 	memset(&initIn,0x00,sizeof(dsmInitExIn_t));
 	initIn.stVersion           = dsmInitExInVersion;
 	initIn.apiVersionExP       = &applApi;
 	initIn.clientNodeNameP     = NULL;
 	initIn.clientOwnerNameP    = NULL;
-	initIn.clientPasswordP     = NULL;
+	initIn.clientPasswordP     = password;
 	initIn.applicationTypeP    = NULL;
 	initIn.configfile          = NULL;
 	initIn.options             = options;
 	initIn.userNameP           = NULL;
 	initIn.userPasswordP       = NULL;
+	initIn.appVersionP         = &pipeApi;
 	//initIn.dirDelimiter        = dirDelimiter;
 	//initIn.useUnicode          = useUnicode;
 	//initIn.bEncryptKeyEnabled  = encrypt;
@@ -111,13 +130,14 @@ dsUint32_t tsm_initsess(char *options) {
 		rc = dsmChangePW(dsmHandle,NULL,NULL);
 
 		if (rc != DSM_RC_OK) {
-			tsm_printerr(dsmHandle,rc,"dsmChangePW failed");
+			printf("%s: dsmChangePW() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
+			dsmTerminate(dsmHandle);
 
 			return 0;
 		}
 
 	} else if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle, rc, "dsmInitEx failed");
+		printf("%s: dsmInitEx() failed %s\n",__func__,tsm_printerr(dsmHandle, rc));
 		dsmTerminate(dsmHandle);
 
 		return 0;
@@ -140,9 +160,7 @@ dsUint32_t tsm_initsess(char *options) {
 	}
 
 	if (!rc || (compressEnabled && ! dsmOpt.compressalways)) {
-		fprintf(stderr,!rc ? "Error Querying Session Capabilities" : "Error, COMPRESSion is ENABLED, but not COMPRESSAlways Yes\n");
-		fprintf(stderr,"\n");
-		exit(1);
+		debugLog(0,__func__,!rc ? "ERROR: Error Querying Session Capabilities" : "ERROR: COMPRESSion is ENABLED, but not COMPRESSAlways Yes",1);
 	}
 
 	return dsmHandle;
@@ -150,6 +168,7 @@ dsUint32_t tsm_initsess(char *options) {
 
 /* List objects that are in TSM */
 int tsm_sessioninfo(dsUint32_t dsmHandle) {
+	extern int verbose;
 	dsInt16_t rc=0;
 	optStruct dsmOpt;
 	ApiSessInfo dsmSessInfo;
@@ -161,8 +180,11 @@ int tsm_sessioninfo(dsUint32_t dsmHandle) {
 	dsmQueryApiVersionEx(&apiLibVer);
 
 	printf("Application Version:\n");
-	printf(" TSMPIPE Version:                %s\n",
-			_TSMPIPE_VERSION);
+	printf(" TSMPIPE Version:                %d.%d.%d.%d\n",
+			TSMPIPE_VERSION,
+			TSMPIPE_RELEASE,
+			TSMPIPE_LEVEL,
+			TSMPIPE_SUBLEVEL);
 	printf(" TSMPIPE API Version:            %d.%d.%d.%d\n",
 			DSM_API_VERSION,
 			DSM_API_RELEASE,
@@ -180,7 +202,7 @@ int tsm_sessioninfo(dsUint32_t dsmHandle) {
 	rc = dsmQuerySessOptions(dsmHandle, &dsmOpt);
 
 	if (rc)
-		printf("dsmQuerySessOptions error on issueing Query Session Options. Rc = %d\n",rc);
+		printf("%s: ERROR dsmQuerySessOptions() unable to query Session Options. RC = %d\n",__func__,rc);
 	else {
 		printf("dsmQuerySessOptions:\n");
 		printf(" DSMI_DIR:                       %s\n",dsmOpt.dsmiDir);
@@ -191,11 +213,17 @@ int tsm_sessioninfo(dsUint32_t dsmHandle) {
 			case DSM_COMM_TCP : strcpy(t,"TCP/IP"); break;
 			case DSM_COMM_NAMEDPIPE : strcpy(t,"NAMED PIPE"); break;
 			case DSM_COMM_SHM : strcpy(t,"SHARED MEMORY"); break;
+			case DSM_COMM_TCPIP6 : strcpy(t,"TCP/IP v6"); break;
 			default: strcpy(t,"UNKNOWN");
 		}
+
 		printf(" COMMmethod:                     %s\n",t);
+		if (verbose)
+			fprintf(stderr,"%s: commMethod: [%d]\n",__func__,dsmOpt.commMethod);
 
 		printf(" TCPServerAddress:               %s\n",dsmOpt.serverAddress);
+		if (verbose)
+			fprintf(stderr,"%s: serverAddress: [%s]\n",__func__,dsmOpt.serverAddress);
 		printf(" NODEName:                       %s\n",dsmOpt.nodeName);
 		printf(" COMPRESSIon:                    %s\n",dsmOpt.compression ? "YES" : "NO");
 		printf(" COMPRESSAlways:                 %s\n",dsmOpt.compressalways ? "YES" : "NO");
@@ -207,7 +235,7 @@ int tsm_sessioninfo(dsUint32_t dsmHandle) {
 	rc = dsmQuerySessInfo(dsmHandle, &dsmSessInfo);
 
 	if (rc)
-		printf("dsmQuerySessOptions error on issueing Query Session Options. Rc = %d\n",rc);
+		printf("%s: ERROR dsmQuerySessInfo() unable to query Session Info. RC = %d\n",__func__,rc);
 	else {
 		printf("\n");
 		printf("dsmQuerySessInfo:\n");
@@ -281,7 +309,7 @@ int tsm_sessioninfo(dsUint32_t dsmHandle) {
  *  0 if tsm_queryfile() should skip processing the remaining matches.
  *  1 otherwise.
  */
-dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_callback usercb, void *userdata, qryArchiveData qaData, qryBackupData qbData) {
+dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_callback usercb, void *userdata, qryArchiveData qaData, qryBackupData qbData, dsBool_t friendly) {
 	extern int verbose;
 	dsInt16_t rc=0;
 	dsmQueryBuff *qDataP;
@@ -294,41 +322,45 @@ dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_call
 		case qtArchive:
 			qDataP = &qaData;
 
-			if (verbose)
-				fprintf(stderr,"tsm_queryfile: Query filespace %s\n",dsmObjnameToStr(*qaData.objName));
-
 			qryRespArchiveData qaResp;
+
+			qResp.bufferLen = sizeof(qaResp);
+			qResp.bufferPtr = (char *) &qaResp;
+
 			qaResp.stVersion = qryRespArchiveDataVersion;
 
-			qResp.bufferPtr = (char *) &qaResp;
-			qResp.bufferLen = sizeof(qaResp);
+			if (verbose)
+				fprintf(stderr,"%s: Query filespace %s\n",__func__,dsmObjnameToStr(*qaData.objName));
+
 			break;
 
 		case qtBackup:
 			qDataP = &qbData;
 
-			if (verbose)
-				fprintf(stderr,"tsm_queryfile: Query filespace %s\n",dsmObjnameToStr(*qbData.objName));
-			if (verbose > 1) {
-				fprintf(stderr,"tsm_queryfile: PIT Date: %s\n",dsmDateToStr(qbData.pitDate));
-				fprintf(stderr,"tsm_queryfile: OBJSTATE : %s\n",qbData.objState==DSM_ACTIVE ? "DSM_ACTIVE" : "DSM_ANY_MATCH");
-			}
-
 			qryRespBackupData qbResp;
+
+			qResp.bufferLen = sizeof(qbResp);
+			qResp.bufferPtr = (char *) &qbResp;
+
 			qbResp.stVersion = qryRespBackupDataVersion;
 
-			qResp.bufferPtr = (char *) &qbResp;
-			qResp.bufferLen = sizeof(qbResp);
+			if (verbose)
+				fprintf(stderr,"%s: Query filespace %s\n",__func__,dsmObjnameToStr(*qbData.objName));
+			if (verbose > 1) {
+				fprintf(stderr,"%s: PIT Date: %s\n",__func__,dsmDateToStr(qbData.pitDate));
+				fprintf(stderr,"%s: OBJSTATE : %s\n",__func__,qbData.objState==DSM_ACTIVE ? "DSM_ACTIVE" : "DSM_ANY_MATCH");
+			}
+
 			break;
 
 		default:
-			fprintf(stderr,"tsm_queryfile: ERROR: Unknown qType: %d?\n",qType);
+			fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 			exit(1);
 	}
 
 	rc = dsmBeginQuery(dsmHandle, qType, qDataP);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_queryfile: dsmBeginQuery failed");
+		printf("%s: dsmBeginQuery() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return rc;
 	}
 
@@ -348,18 +380,18 @@ dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_call
 				rObjName = &(qr->objName);
 
 			} else {
-				fprintf(stderr,"tsm_queryfile: Internal error: Unknown qType %d\n",qType);
+				fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 
 				return DSM_RC_UNKNOWN_ERROR;
 			}
 
-			fprintf(stderr,"tsm_queryfile: Match file %s\n",dsmObjnameToStr(*rObjName));
+			fprintf(stderr,"%s: Match file %s\n",__func__,dsmObjnameToStr(*rObjName));
 		}
 
 		if (usercb == NULL)
 			continue;
 
-		cbret = usercb(qType,&qResp,userdata);
+		cbret = usercb(qType,&qResp,userdata,friendly);
 		if (cbret < 0) {
 			return DSM_RC_UNKNOWN_ERROR;
 
@@ -369,15 +401,183 @@ dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_call
 	}
 
 	if (rc != DSM_RC_FINISHED && rc != DSM_RC_MORE_DATA) {
-		tsm_printerr(dsmHandle,rc,"tsm_queryfile: dsmGetNextObj failed");
+		printf("%s: dsmGetNextQObj() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return rc;
 	}
 
 	rc = dsmEndQuery(dsmHandle);
 	if (rc != DSM_RC_OK) {
-		tsm_printerr(dsmHandle,rc,"tsm_queryfile: dsmEndQuery failed");
+		printf("%s: dsmEndQuery() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
 		return rc;
 	}
 
 	return DSM_RC_OK;
 }
+
+/* Signal handler */
+int intrupt = 0;
+void Catch(int signo) {
+	if(signo) {}; /* so compiler won't complain about unused arguments */
+
+	intrupt = 1;
+}
+
+/* Uses sigaction to establish signal handler */
+int install_sig_handler(int signum, void (*sig_handler)(int)) {
+	struct sigaction action;
+	int rc;
+
+	action.sa_handler = sig_handler; /* signal handler function  */
+	sigemptyset( &action.sa_mask );  /* mask of signals to block */
+
+	action.sa_flags = SA_NOCLDSTOP;
+
+	rc = sigaction(
+		signum,   /*  I */ /* signal identifier            */
+		&action,  /* *I */ /* new action for signal        */
+		NULL );   /* *O */ /* previous action - not needed */
+
+	return (rc);
+}
+
+int ReadPass(char *text, char *buffer, int length) {
+	struct termio ttyState, ttyStateSave;
+	register char *p;
+	register int c;
+	int rc;
+	FILE *ttyFH;
+
+	struct sigaction  action;
+
+	/* Let's flush any prompt to the terminal that may be pending. */
+	fflush(stdout);
+
+	/* Open the console input device */
+	if((ttyFH = fopen("/dev/tty", "r")) == NULL)
+		return(-1);
+	else
+		setbuf(ttyFH, (char *)NULL);
+
+	/* Reset the interrupt flag */
+	intrupt = 0;
+
+	/* Trap the "BREAK" interrupt */
+	(void) sigaction( SIGINT, NULL, &action );    /* save current hdlr */
+	(void) install_sig_handler( SIGINT, Catch );  /* install new hdlr  */
+
+	/* Get current state */
+	rc = ioctl(fileno(ttyFH), TCGETA, &ttyStateSave);
+	if (rc == -1)
+		return(-1);
+
+	/* Copy the saved tty state into a work field */
+	ttyState = ttyStateSave;
+
+	/* Turn off ECHO */
+	ttyState.c_lflag &= ~ECHO;
+	rc = ioctl(fileno(ttyFH), TCSETA, &ttyState);
+	if (rc == -1)
+		return(-1);
+
+	printf(text);
+
+	/* Read the password (quietly) */
+	for(p=buffer; !intrupt && (c = getc(ttyFH)) != '\n' && c != EOF; ) {
+		if(p < buffer+length)
+			*p++ = c;
+	}
+	*p = '\0';
+
+	printf("\n");
+
+	/* Restore the tty state settings */
+	rc = ioctl(fileno(ttyFH), TCSETA, &ttyStateSave);
+	if (rc == -1)
+		return(-1);
+
+	/* Reset the interrupt handler */
+	(void) sigaction( SIGINT, &action, NULL );
+
+	if(ttyFH != stdin)
+		(void) fclose(ttyFH);
+	if(intrupt)
+		(void) kill(getpid(), SIGINT);
+
+	return(strlen(buffer));
+}
+
+/*
+ * Set the TSM Node password
+ *
+ * We use a callback to process the list, the callback should return:
+ */
+int tsm_setpassword(char *options) {
+	uint32 dsmHandle;
+	bool_t done = bFalse;
+	uint16 pw_trys = 0;
+	uint16 len = 0;
+	char input[INPUTLEN];
+	char pw_cur[DSM_MAX_VERIFIER_LENGTH + 1];
+	char pw_new [DSM_MAX_VERIFIER_LENGTH + 1];
+
+	int rc;
+
+	while (!done) {
+		// Current Password
+		rc = ReadPass("Enter your current password: ",input,INPUTLEN);
+		len = strlen(input);
+		if ((len > DSM_MAX_VERIFIER_LENGTH) || !len || (rc < 0)) {
+			printf("Current password is invalid.  Please try again.\n");
+			continue;
+		} else {
+			strcpy(pw_cur,input);
+		}
+
+		// New password
+		rc = ReadPass("Enter your new password: ",input,INPUTLEN);
+		len = strlen(input);
+		if ((len > DSM_MAX_VERIFIER_LENGTH) || !len || (rc < 0)) {
+			printf("New password is invalid.  Please try again.\n");
+			continue;
+		} else {
+			strcpy(pw_new,input);
+		}
+
+		// Verify new password
+		rc = ReadPass("Enter your new password again: ",input,INPUTLEN);
+		len = strlen(input);
+		if ((len > DSM_MAX_VERIFIER_LENGTH) || !len || (rc < 0)) {
+			printf("New password is invalid.  Please try again.\n");
+			continue;
+
+		} else {
+			// Compare new pw copies to make sure no typos from user.
+			if ((strcmp(pw_new,input))) {
+				pw_trys++;
+
+				if (pw_trys > 3)
+					debugLog(0,__func__,"ERROR: Passwords dont match, tried too many times.",3);
+				else
+					debugLog(0,__func__,"WARN: Your new passwords do not match, please try again...",0);
+
+			} else {
+				done = bTrue;
+			}
+		}
+	}
+
+	dsmHandle = tsm_initsess(options,pw_cur);
+	if (! dsmHandle) {
+		debugLog(0,__func__,"ERROR: Unable to create TSM session with your password.",2);
+	}
+
+	rc = dsmChangePW(dsmHandle,pw_cur,pw_new);
+	if (rc)
+		debugLog(0,__func__,"ERROR: Password change failed.",2);
+	else
+		printf("\nYour new password has been accepted and updated.\n");
+
+	dsmTerminate(dsmHandle);
+
+	return 1;
+}

scripts/tdp.mysql.sh

@@ -60,7 +60,7 @@ done
 
 # Our defaults
 FILESPACE=${FILESPACE:-"/mysqldump"}
-MYSQL_ARGS=${MYSQL_ARGS:-"-K --skip-extended-insert --skip-dump-date --log-error=/var/log/tsm/tdp.mysql.log"}
+MYSQL_ARGS=${MYSQL_ARGS:-"-FlK --skip-extended-insert --skip-dump-date --log-error=/var/log/tsm/tdp.mysql.log"}
 
 [ -n "$DBPASS" ] && MYSQL_AUTH="-p${DBPASS}"
 [ -n "$DBUSER" ] && MYSQL_AUTH="-u${DBUSER} ${MYSQL_AUTH}"

test/dsm.opt

@@ -0,0 +1 @@
+COMPRESSAlways Y

test/dsm.sys

@@ -0,0 +1,20 @@
+DEFAULTServer test
+SErvername	test
+	COMMmethod			TCPip
+	MANAGEDServices		schedule
+	TCPPort				1500
+	TCPServeraddress	tsm.leenooks.net
+	PASSWORDAccess		generate
+	SCHEDMode		polling
+
+	ERRORLOGRetention	10,d
+	ERRORLOGName		/tmp/dsmerror.log
+	SCHEDLOGName		/tmp/dsmsched.log
+	SCHEDLOGRetention	10,d
+
+	TCPNodelay			Yes
+	TCPBuffsize			32
+	TCPWindowsize		64
+	SSL			No
+
+	PASSWORDDIR /tsm

test/test.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+cd $(dirname $0)
+
+set -e
+FILE=random.1m
+VERBOSE=${VERBOSE:-""}
+
+# Create TEST File
+MD5=$(dd if=/dev/urandom bs=10240 count=1024 2>/dev/null |tee ${FILE} |md5sum |awk '{print $1}')
+SIZE=$(ls -l ${FILE}|awk '{print $5}')
+TSMOPT="-VIRTUALNODENAME=TEST -PASSWORD=password -COMPRESSALWAYS=YES"
+
+TSMPIPE=../tsmpipe
+
+echo "MD5 of [${FILE}] is [${MD5}] (${SIZE})"
+
+ln -fs /opt/tivoli/tsm/client/api/bin64/EN_US
+export DSMI_DIR=./
+export DSMI_CONFIG=dsm.opt
+
+# Send file to TSM
+echo "+++ TEST BACKUP ++++!"
+echo "+ BACKUP: SEND FILE!"
+cat ${FILE} | ${TSMPIPE} -Bcm MD5 -s /test -f ${FILE} ${VERBOSE} -l ${SIZE} -O"${TSMOPT}"
+
+# Send a second time
+echo "+ BACKUP: SEND FILE AGAIN!"
+cat ${FILE} | ${TSMPIPE} -Bcm MD5 -s /test -f ${FILE} ${VERBOSE} -l ${SIZE} -O"${TSMOPT}"
+
+# List it
+echo "+ BACKUP: LIST FILE!"
+${TSMPIPE} -Bts /test -f ${FILE} -O"${TSMOPT}"
+
+# Get it back
+echo "+ BACKUP: RETRIEVE FILE!"
+${TSMPIPE} -Bxs /test -f ${FILE} ${VERBOSE} -O"${TSMOPT}" > ${FILE}.back
+RETRIEVE=$(md5sum ${FILE}.back | awk '{print $1}')
+if [ "${MD5}" != "${RETRIEVE}" ]; then
+	exit 1
+else
+	echo "+ BACKUP: RETRIEVE VALID (${RETRIEVE})!"
+fi
+
+# Purge the last one
+echo "+ BACKUP: PURGE!"
+${TSMPIPE} -Bgs /test -f ${FILE} ${VERBOSE} -O"${TSMOPT}"
+
+# List it
+echo "+ BACKUP: LIST FILE IS PURGED!"
+${TSMPIPE} -Bts /test -f ${FILE} -O"${TSMOPT}"
+
+# Delete it
+echo "+ BACKUP: DELETE!"
+${TSMPIPE} -Bds /test -f ${FILE} ${VERBOSE} -O"${TSMOPT}"
+
+# List it
+echo "+ BACKUP: LIST FILE IS DELETED!"
+${TSMPIPE} -Bts /test -f ${FILE} -O"${TSMOPT}"
+echo "+++ END BACKUP ++++!"
+
+echo "+++ TEST ARCHIVE ++++!"
+echo "+ ARCHIVE: SEND FILE!"
+cat ${FILE} | ${TSMPIPE} -Acm MD5 -s /test -f ${FILE} ${VERBOSE} -l ${SIZE} -D"Test Archive File" -O"${TSMOPT}"
+
+# Send a second time
+echo "+ ARCHIVE: SEND FILE AGAIN! (delay)"
+sleep 2
+cat ${FILE} | ${TSMPIPE} -Acm MD5 -s /test -f ${FILE} ${VERBOSE} -l ${SIZE} -D"Test Archive File" -O"${TSMOPT}"
+DATE=$(date +%m%d%Y:%H%M%S)
+
+# List it
+echo "+ ARCHIVE: LIST FILE!"
+${TSMPIPE} -Ats /test -f ${FILE} -O"${TSMOPT}"
+
+# Get it back
+echo "+ ARCIHVE: RETRIEVE FILE! (${DATE})"
+${TSMPIPE} -Axs /test -f ${FILE} -n ${DATE} ${VERBOSE} -O"${TSMOPT}" > ${FILE}.back
+RETRIEVE=$(md5sum ${FILE}.back | awk '{print $1}')
+if [ "${MD5}" != "${RETRIEVE}" ]; then
+	exit 1
+else
+	echo "+ ARCHIVE: RETRIEVE VALID (${RETRIEVE})!"
+fi
+
+# Purge the last one
+echo "+ ARCHIVE: DELETE!"
+${TSMPIPE} -Ads /test -f ${FILE} -n ${DATE} ${VERBOSE} -O"${TSMOPT}"
+
+# List it
+echo "+ ARCHIVE: LIST FILE AFTER DELETE!"
+${TSMPIPE} -Ats /test -f ${FILE} -O"${TSMOPT}"
+echo "+++ END ARCHIVE ++++!"
+
+rm -f EN_US ${FILE} ${FILE}.back

tsmpipe.c

@@ -50,7 +50,7 @@ int copy_env(const char *from, const char *to) {
 
 	e = getenv(from);
 	if (!e) {
-		fprintf(stderr,"tsmpipe: Environment variable %s not set\n",from);
+		fprintf(stderr,"%s: Environment variable %s not set\n",__func__,from);
 		return 0;
 	}
 
@@ -67,10 +67,11 @@ int copy_env(const char *from, const char *to) {
 
 void usage(void) {
 	fprintf(stderr,
-		"tsmpipe %s, usage:\n"
+		"tsmpipe %d.%d.%d.%d, usage:\n"
 		"\n"
-		"tsmpipe [-i]|[[-A|-B|-U] [-c|-x|-d|-t] -s fsname -f filepath [-l len] ...]\n"
-		"   -i Show session information:\n"
+		"tsmpipe [-i|-p]|[[-A|-B|-U] [-c|-x|-d|-g|-t] -s fsname -f filepath [-l len] ...]\n"
+		"   -i Show session information\n"
+		"   -p Set Password\n"
 		"   -A, -B and -U are mutually exclusive:\n"
 		"       -A  Use Archive objects\n"
 		"       -B  Use Backup objects\n"
@@ -79,10 +80,12 @@ void usage(void) {
 		"       -c  Create:  Read from stdin and store in TSM\n"
 		"       -x  eXtract: Recall from TSM and write to stdout\n"
 		"       -d  Delete:  Delete object from TSM\n"
+		"       -g  purGe:   Active Delete object from TSM\n"
 		"       -t  lisT:    Print filelist to stdout\n"
 		"   -s and -f are required arguments for (-A/ -B operations):\n"
 		"       -s fsname   Name of filespace in TSM\n"
 		"       -f filepath Path to file within filesystem in TSM\n"
+		"   -F Friendly output, only valid for -t\n"
 		"   -l length   Length of object to store. If guesstimating, too large\n"
 		"               is better than too small\n"
 		"   -L length   Length of object to store. But also update the FS with\n"
@@ -99,17 +102,15 @@ void usage(void) {
 #endif
 		"   -v          Verbose. More -v's gives more verbosity\n"
 		"   -V          Verbose information on TSM transfer\n"
-	,_TSMPIPE_VERSION);
+	,TSMPIPE_VERSION,TSMPIPE_RELEASE,TSMPIPE_LEVEL,TSMPIPE_SUBLEVEL);
 
-	exit(1);
+	exit(0);
 }
 
 void usage_action(void) {
-	fprintf(stderr, "tsmpipe: ERROR: Must give one of -i, -c, -x, -d, -t\n");
-	exit(1);
+	debugLog(0,__func__,"ERROR: Must give one of -i, -p, -c, -x, -d, -t",1);
 }
 
-
 int main(int argc, char *argv[]) {
 	int c;
 	extern int optopt;
@@ -117,6 +118,7 @@ int main(int argc, char *argv[]) {
 	int action=0;
 	char *space=NULL, *filename=NULL, *lenstr=NULL, *desc=NULL, *pitdate=NULL, *options=NULL, *expdate_low=NULL, *expdate_high=NULL, *insdate_low=NULL, *insdate_high=NULL;
 	dsBool_t summary=bFalse;
+	dsBool_t friendly=bFalse;
 	off_t length;
 	dsUint32_t dsmHandle;
 	dsmQueryType qType=0xff; // We set this to an unlikely value, it should be set correctly via our getopt
@@ -129,16 +131,18 @@ int main(int argc, char *argv[]) {
 	char *digest=NULL;
 #endif
 
-	while ((c = getopt(argc, argv, "hiABcxdtUvVe:E:f:l:L:m:n:N:s:D:O:P:")) != -1) {
+	while ((c = getopt(argc, argv, "hiABcxdtUvVe:E:f:Fgl:L:m:n:N:s:D:O:pP:")) != -1) {
 		switch(c) {
 			case 'h': usage(); break;
 			case 'A': qType = qtArchive; break;
 			case 'B': qType = qtBackup; break;
 
 			case 'i': if (action != 0) usage_action(); action = ACTION_INFO; break;
+			case 'p': if (action != 0) usage_action(); action = ACTION_PASSWORD; break;
 			case 'c': if (action != 0) usage_action(); action = ACTION_CREATE; break;
 			case 'x': if (action != 0) usage_action(); action = ACTION_EXTRACT; break;
 			case 'd': if (action != 0) usage_action(); action = ACTION_DELETE; break;
+			case 'g': if (action != 0) usage_action(); action = ACTION_PURGE; break;
 			case 't': if (action != 0) usage_action(); action = ACTION_LIST; break;
 			case 'U': if (action != 0) usage_action(); action = ACTION_UPDATE; break;
 
@@ -146,6 +150,7 @@ int main(int argc, char *argv[]) {
 			case 'V': summary = bTrue; break;
 			case 's': space = optarg; break;
 			case 'f': filename = optarg; break;
+			case 'F': friendly = bTrue; break;
 			case 'l': lenstr = optarg; break;
 			case 'L': lenstr = optarg; if (action != ACTION_CREATE) usage_action(); action = ACTION_CREATE_UPDATE; break;
 			case 'D': desc = optarg; break;
@@ -162,57 +167,68 @@ int main(int argc, char *argv[]) {
 			case 'N': insdate_high = optarg; break;
 
 			case ':':
-				fprintf(stderr, "tsmpipe: Option -%c requires an operand\n", optopt);
+				fprintf(stderr,"%s: Option -%c requires an operand\n",__func__,optopt);
 				exit(1);
 			case '?':
-				fprintf(stderr, "tsmpipe: Unrecognized option: -%c\n", optopt);
+				fprintf(stderr,"%s: Unrecognized option: -%c\n",__func__,optopt);
 				exit(1);
 		}
 	}
 
 	// Arguement Validation
 	if (action == 0) {
-		fprintf(stderr, "tsmpipe: ERROR: Must give one of -i, -c, -x, -d, -t\n");
-		exit(1);
+		usage_action();
+	}
+
+	if (action == ACTION_PASSWORD) {
+		rc = tsm_setpassword(options);
+
+		if (! rc)
+			debugLog(0,__func__,"ERROR: Operation Failed",3);
+		else
+			debugLog(1,__func__,"Operation Success",0);
+
+		exit(0);
+	}
+
+	if (action != ACTION_LIST && friendly) {
+		debugLog(0,__func__,"ERROR: -F can only be used with -t",1);
 	}
 
 	if (pitdate && qType != qtBackup) {
-		fprintf(stderr, "tsmpipe: ERROR: -P can only be used with -B\n");
-		exit(1);
+		debugLog(0,__func__,"ERROR: -P can only be used with -B",1);
 	}
 
 	if ((insdate_low|| insdate_high || expdate_low || expdate_high) && qType != qtArchive) {
-		fprintf(stderr, "tsmpipe: ERROR: -e, -E, -n, -N can only be used with -A\n");
-		exit(1);
+		debugLog(0,__func__,"ERROR: -e, -E, -n, -N can only be used with -A",1);
 	}
 
 	if (action != ACTION_INFO) {
 		if (! space) {
-			fprintf(stderr, "tsmpipe: ERROR: Must give -s filespacename\n");
-			exit(1);
+			debugLog(0,__func__,"ERROR: Must give -s filespacename",1);
 		}
 
 		if (! filename && action != ACTION_UPDATE) {
-			fprintf(stderr, "tsmpipe: ERROR: Must give -f filename\n");
-			exit(1);
+			debugLog(0,__func__,"ERROR: Must give -f filename",1);
 		}
 
 		if ((action == ACTION_CREATE || action == ACTION_CREATE_UPDATE || action == ACTION_UPDATE) && ! lenstr) {
-			fprintf(stderr, "tsmpipe: ERROR: Must give -l|-L length with -c | -u\n");
-			exit(1);
+			debugLog(0,__func__,"ERROR: Must give -l|-L length with -c | -u",1);
 		}
 
 		if ((action != ACTION_CREATE && action != ACTION_CREATE_UPDATE && action != ACTION_UPDATE) && lenstr) {
-			fprintf(stderr, "tsmpipe: ERROR: -l|-L length useless without -c | -u\n");
-			exit(1);
+			debugLog(0,__func__,"ERROR: -l|-L length useless without -c | -u",1);
 		}
 
 		if (desc && qType != qtArchive) {
-			fprintf(stderr, "tsmpipe: ERROR: -D desc useless without -A\n");
-			exit(1);
+			debugLog(0,__func__,"ERROR: -D desc useless without -A",1);
 		}
 	}
 
+	if (action == ACTION_PURGE && qType != qtBackup) {
+		debugLog(0,__func__,"ERROR: -g can only be used with -B",1);
+	}
+
 	/* Let the TSM api get the signals */
 	signal(SIGPIPE, SIG_IGN);
 	signal(SIGINT, SIG_IGN);
@@ -222,18 +238,18 @@ int main(int argc, char *argv[]) {
 		exit(1);
 
 	// OK, we are ready to talk to TSM
-	debugLog(1,stderr,"tsmpipe: Create TSM session",0);
+	debugLog(1,__func__,"Create TSM session",0);
 
-	dsmHandle = tsm_initsess(options);
+	dsmHandle = tsm_initsess(options,NULL);
 	if (! dsmHandle)
-		debugLog(0,stderr,"tsmpipe: Unable to create TSM session?",2);
+		debugLog(0,__func__,"ERROR: Unable to create TSM session?",2);
 
-	debugLog(2,stderr,"tsmpipe: Session Initiated",0);
+	debugLog(2,__func__,"Session Initiated",0);
 
 	switch (action) {
 		// Show our session information
 		case ACTION_INFO:
-			debugLog(2,stderr,"tsmpipe: INFO Operation",0);
+			debugLog(2,__func__,"INFO Operation",0);
 
 			rc = tsm_sessioninfo(dsmHandle);
 			break;
@@ -241,11 +257,11 @@ int main(int argc, char *argv[]) {
 		// If we are backing up or archiving
 		case ACTION_CREATE:
 		case ACTION_CREATE_UPDATE:
-			debugLog(2,stderr,"tsmpipe: CREATE Operation",0);
+			debugLog(2,__func__,"CREATE Operation",0);
 
 			length = atof(lenstr);
 			if (length <= 0)
-				debugLog(0,stderr,"tsmpipe: ERROR: Provide positive length, overestimate if guessing",1);
+				debugLog(0,__func__,"ERROR: Provide positive length, overestimate if guessing",1);
 
 #ifdef USE_DIGEST
 			stored = tsm_sendfile(dsmHandle,space,filename,length,desc,((qType == qtArchive) ? stArchiveMountWait : stBackupMountWait),((action == ACTION_CREATE_UPDATE && qType==qtBackup) ? bTrue : bFalse),summary,digest);
@@ -255,13 +271,14 @@ int main(int argc, char *argv[]) {
 			rc = stored ? 1 : 0;
 
 			if (rc && action == ACTION_CREATE_UPDATE && qType==qtBackup) {
-				debugLog(2,stderr,"tsmpipe: UPDATE FS Operation",0);
+				debugLog(2,__func__,"UPDATE FS Operation",0);
 				rc = tsm_updatefs(dsmHandle,space,stored);
 			}
 
 			break;
 
 		case ACTION_DELETE:
+		case ACTION_PURGE:
 		case ACTION_LIST:
 		case ACTION_EXTRACT:
 			memset(&qaData,0x00,sizeof(qryArchiveData));
@@ -276,6 +293,7 @@ int main(int argc, char *argv[]) {
 					qbData.owner = "";
 
 					switch (action) {
+						case ACTION_PURGE:
 						case ACTION_DELETE:
 							qbData.objState = DSM_ACTIVE;
 							break;
@@ -289,7 +307,7 @@ int main(int argc, char *argv[]) {
 							break;
 					}
 
-					if (action == ACTION_DELETE || ! pitdate) {
+					if (action == ACTION_DELETE || action == ACTION_PURGE || ! pitdate) {
 						qbData.pitDate.year = DATE_MINUS_INFINITE;
 					} else {
 						qbData.pitDate = dsmStrToDate(pitdate);
@@ -322,28 +340,34 @@ int main(int argc, char *argv[]) {
 					break;
 
 				default:
-					fprintf(stderr,"tsmpipe: UNKNOWN Type %d",qType);
+					fprintf(stderr,"%s: UNKNOWN Type %d\n",__func__,qType);
 					exit(2);
 			}
 
 			switch (action) {
 				case ACTION_DELETE:
-					debugLog(2,stderr,"tsmpipe: DELETE Operation",0);
+					debugLog(2,__func__,"DELETE Operation",0);
 					rc = tsm_deletefile(dsmHandle,qType,qaData,qbData);
 					break;
 
+				case ACTION_PURGE:
+					debugLog(2,__func__,"PURGE Operation",0);
+					/** We use qtReserved8 to let tsm_deletefile() know that we want to purge - this will break a future API **/
+					rc = tsm_deletefile(dsmHandle,qtReserved8,qaData,qbData);
+					break;
+
 				case ACTION_EXTRACT:
-					debugLog(2,stderr,"tsmpipe: EXTRACT Operation",0);
+					debugLog(2,__func__,"EXTRACT Operation",0);
 					rc = tsm_restorefile(dsmHandle,qType,qaData,qbData);
 					break;
 
 				case ACTION_LIST:
-					debugLog(2,stderr,"tsmpipe: LIST Operation",0);
-					rc = tsm_listfile(dsmHandle,qType,qaData,qbData);
+					debugLog(2,__func__,"LIST Operation",0);
+					rc = tsm_listfile(dsmHandle,qType,qaData,qbData,friendly);
 					break;
 
 				default:
-					fprintf(stderr,"tsmpipe: Action not yet programmed for%d",action);
+					fprintf(stderr,"%s: Action not yet programmed for %d\n",__func__,action);
 					exit(2);
 			}
 			break;
@@ -351,24 +375,24 @@ int main(int argc, char *argv[]) {
 		case ACTION_UPDATE:
 			length = atof(lenstr);
 			if (length <= 0)
-				debugLog(0,stderr,"tsmpipe: ERROR: Provide positive length",1);
+				debugLog(0,__func__,"ERROR: Provide positive length",1);
 
 			rc = tsm_updatefs(dsmHandle,space,length);
 			break;
 
 		default:
-			fprintf(stderr,"tsmpipe: UNKNOWN Operation %d",action);
+			fprintf(stderr,"%s: UNKNOWN Operation %d",__func__,action);
 			exit(2);
 	}
 
-	debugLog(1,stderr,"tsmpipe: Terminate TSM session",0);
+	debugLog(1,__func__,"Terminate TSM session",0);
 
 	dsmTerminate(dsmHandle);
 
 	if (! rc)
-		debugLog(0,stderr,"tsmpipe: Operation Failed",3);
+		debugLog(0,__func__,"ERROR: Operation Failed",3);
 	else
-		debugLog(1,stderr,"tsmpipe: Operation Success",0);
+		debugLog(1,__func__,"Operation Success",0);
 
 	return 0;
 }

tsmpipe.h

@@ -1,4 +1,8 @@
-#define _TSMPIPE_VERSION "1.6.2"
+#define TSMPIPE_VERSION 1
+#define TSMPIPE_RELEASE 6
+#define TSMPIPE_LEVEL 6
+#define TSMPIPE_SUBLEVEL 0
+#define INPUTLEN 1025
 
 #define ACTION_INFO 1
 #define ACTION_CREATE 2
@@ -7,6 +11,9 @@
 #define ACTION_LIST 5
 #define ACTION_UPDATE 6
 #define ACTION_CREATE_UPDATE 7
+#define ACTION_PASSWORD 8
+#define ACTION_PURGE 9
+#define DSM_COMM_TCPIP6 6  // There is no DSM_COMM_ const for TCPIPv6
 
 // If you want to use MD5/SHA1 calculations as the data goes in here, ensure this is defined.
 #define USE_DIGEST
@@ -15,27 +22,28 @@
 #include <openssl/evp.h>
 #endif
 
-typedef int (*tsm_query_callback)(dsmQueryType, DataBlk *, void *);
+typedef int (*tsm_query_callback)(dsmQueryType, DataBlk *, void *, dsmBool_t friendly);
 
 struct matchone_cb_data { int numfound; dsStruct64_t objId; dsUint32_t copyGroup; };
 
-extern void tsm_printerr   (dsUint32_t dsmHandle, dsInt16_t rc, char *str);
-extern void debugLog(int level, _IO_FILE *output, char *message, int die);
+extern char *tsm_printerr (dsUint32_t dsmHandle, dsInt16_t rc);
+extern void debugLog (int level, const char *func, char *message, int die);
 
 extern dsmDate dsmStrToDate(char *s);
 extern dsmObjName dsmNameToObjname(char *fsname, char *filename);
-extern dsInt16_t tsm_queryfile(dsUint32_t sesshandle, dsmQueryType qType, tsm_query_callback usercb, void *userdata, qryArchiveData qaData, qryBackupData qbData);
-extern dsUint32_t tsm_initsess(char *options);
+extern dsInt16_t tsm_queryfile(dsUint32_t sesshandle, dsmQueryType qType, tsm_query_callback usercb, void *userdata, qryArchiveData qaData, qryBackupData qbData, dsBool_t friendly);
+extern dsUint32_t tsm_initsess(char *options, char *password);
 extern dsBool_t compressEnabled;
 
 extern int tsm_deletefile (dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaData, qryBackupData qbData);
-extern int tsm_listfile   (dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaData, qryBackupData qbData);
+extern int tsm_listfile   (dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaData, qryBackupData qbData, dsBool_t friendly);
 extern int tsm_restorefile(dsUint32_t dsmHandle, dsmQueryType qType, qryArchiveData qaData, qryBackupData qbData);
 #ifdef USE_DIGEST
 extern double tsm_sendfile   (dsUint32_t dsmHandle, char *fsname, char *filename, long long length, char *description, dsmSendType sendtype, dsBool_t startstop, dsBool_t summary, char *digest);
 #else
 extern double tsm_sendfile   (dsUint32_t dsmHandle, char *fsname, char *filename, long long length, char *description, dsmSendType sendtype, dsBool_t startstop, dsBoot_t summary);
 #endif
+extern int tsm_setpassword(char *options);
 extern int tsm_sessioninfo(dsUint32_t dsmHandle);
 extern int tsm_updatefs(dsUint32_t dsmHandle, char *fsname, long long size);
 extern int tsm_datefs(dsUint32_t dsmHandle, char *fsname, int startstop);