Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 f96b094: Fix the calculation of a file's "basename".

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

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

Commits:

f96b094 by Guy Harris (guy@xxxxxxxxxxxx):

    Fix the calculation of a file's "basename".
    
    Strip off only extensions that correspond to file types we know about;
    QFileInfo::baseName() strips off *all* extensions, where "extension" is
    "anything preceded by a .", so it turns foo.bar.pcap.gz into foo, not
    foo.bar.  We don't want that; instead, we strip off only those
    extensions that correspond to file types we know how to read, so we'd
    strip off .pcap.gz in foo.bar.pcap.gz, and strip off .pcap in
    foo.bar.pcap, leaving foo.bar in both cases.
    
    Change-Id: I5385921ad2f0fef815d52e9902fef15735fd9dae
    Reviewed-on: https://code.wireshark.org/review/28636
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit aab5ad074e88e3c03e438b2b9ff503191c6f6458)
    Reviewed-on: https://code.wireshark.org/review/28637
    

Actions performed:

    from  916ca12   wisun: fix remove EAPOL-ready field; add Routing Cost to info
    adds  f96b094   Fix the calculation of a file's "basename".


Summary of changes:
 debian/libwiretap8.symbols |  1 +
 file.c                     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 file.h                     | 11 +++++++++++
 ui/qt/capture_file.cpp     | 11 +++++------
 wiretap/file_access.c      | 43 ++++++++++++++++++++++++++++++++++++-------
 wiretap/wtap.h             |  2 ++
 6 files changed, 101 insertions(+), 13 deletions(-)