[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=158049e14b1044e77b70f4e3f0b99b273333d6c6
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

158049e by Guy Harris (guy@xxxxxxxxxxxx):

    Allow multiple -D/-L/-d/-S flags, only allow one -k flag.
    
    Multiple instances of a single flag from -D/-L/-d/-S should behave like
    a single instance of that flag; -D plus -L, for example, is not
    supported, but -D plus another -D should be.  -k, however, takes an
    argument, and we only support one.
    
    Change-Id: I8baced346fbffd75f8d768497213f67bb9a0555f
    Reviewed-on: https://code.wireshark.org/review/7723
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 7a14f89f12f72bf14b4fc69f9a0c4a4974bae089)
    Reviewed-on: https://code.wireshark.org/review/7725
    

Actions performed:

    from  53f8c44   Update an error message to reflect all the run-dumpcap-and-quit arguments.
    adds  158049e   Allow multiple -D/-L/-d/-S flags, only allow one -k flag.


Summary of changes:
 dumpcap.c |   37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)