Changeset 98322 in vbox
- Timestamp:
- Jan 26, 2023 3:59:04 PM (21 months ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 9 edited
- 1 moved
-
include/iprt/formats/tar.h (moved) (moved from trunk/src/VBox/Runtime/common/zip/tar.h ) (1 diff)
-
include/iprt/tar.h (deleted)
-
src/VBox/Main/include/ApplianceImpl.h (modified) (1 diff)
-
src/VBox/Main/src-all/ExtPackUtil.cpp (modified) (1 diff)
-
src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (3 diffs)
-
src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)
-
src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Runtime/common/zip/tar.cpp (deleted)
-
src/VBox/Runtime/common/zip/tarvfs.cpp (modified) (1 diff)
-
src/VBox/Runtime/common/zip/tarvfsreader.h (modified) (1 diff)
-
src/VBox/Runtime/common/zip/tarvfswriter.cpp (modified) (1 diff)
-
src/VBox/Runtime/include/internal/magics.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/iprt/formats/tar.h
r98321 r98322 67 67 #define RTZIPTAR_TF_GNU_VOLDHR 'V' 68 68 /** @} */ 69 70 /** Maximum length of a tar filename, excluding the terminating '\0'. More 71 * does not fit into a tar record. */ 72 #define RTZIPTAR_NAME_MAX 99 69 73 70 74 -
trunk/src/VBox/Main/include/ApplianceImpl.h
r98103 r98322 39 39 /** @todo This file needs massive cleanup. Split IAppliance in a public and 40 40 * private classes. */ 41 #include <iprt/tar.h>42 41 #include "ovfreader.h" 43 42 #include <set> -
trunk/src/VBox/Main/src-all/ExtPackUtil.cpp
r98103 r98322 42 42 #include <iprt/string.h> 43 43 #include <iprt/vfs.h> 44 #include <iprt/tar.h>45 44 #include <iprt/zip.h> 46 45 #include <iprt/cpp/xml.h> -
trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp
r98307 r98322 35 35 #include <iprt/zip.h> 36 36 37 #include <iprt/formats/tar.h> 38 37 39 #include <VBox/version.h> 38 40 … … 416 418 417 419 strTargetImageName = Utf8StrFmt("%s-disk%.3d.vmdk", strBasename.c_str(), ++pAppliance->m->cDisks); 418 if (strTargetImageName.length() > RT TAR_NAME_MAX)420 if (strTargetImageName.length() > RTZIPTAR_NAME_MAX) 419 421 throw setError(VBOX_E_NOT_SUPPORTED, 420 422 tr("Cannot attach disk '%s' -- file name too long"), strTargetImageName.c_str()); … … 507 509 508 510 strTargetImageName = Utf8StrFmt("%s-disk%.3d.iso", strBasename.c_str(), ++pAppliance->m->cDisks); 509 if (strTargetImageName.length() > RT TAR_NAME_MAX)511 if (strTargetImageName.length() > RTZIPTAR_NAME_MAX) 510 512 throw setError(VBOX_E_NOT_SUPPORTED, 511 513 tr("Cannot attach image '%s' -- file name too long"), strTargetImageName.c_str()); -
trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
r98307 r98322 34 34 #include <iprt/sha.h> 35 35 #include <iprt/manifest.h> 36 #include <iprt/tar.h>37 36 #include <iprt/zip.h> 38 37 #include <iprt/stream.h> … … 42 41 #include <iprt/crypto/x509.h> 43 42 #include <iprt/rand.h> 43 44 #include <iprt/formats/tar.h> 44 45 45 46 #include <VBox/vd.h> -
trunk/src/VBox/Runtime/Makefile.kmk
r98307 r98322 747 747 common/vfs/vfsprintf.cpp \ 748 748 common/zip/cpiovfs.cpp \ 749 common/zip/tar.cpp \750 749 common/zip/tarcmd.cpp \ 751 750 common/zip/tarvfs.cpp \ … … 2456 2455 common/vfs/vfsstdpipe.cpp \ 2457 2456 common/zip/gzipvfs.cpp \ 2458 common/zip/tar.cpp \2459 2457 common/zip/tarcmd.cpp \ 2460 2458 common/zip/tarvfs.cpp \ -
trunk/src/VBox/Runtime/common/zip/tarvfs.cpp
r98103 r98322 52 52 #include <iprt/vfslowlevel.h> 53 53 54 #include "tar.h"54 #include <iprt/formats/tar.h> 55 55 #include "tarvfsreader.h" 56 56 -
trunk/src/VBox/Runtime/common/zip/tarvfsreader.h
r98103 r98322 41 41 #endif 42 42 43 #include "tar.h"43 #include <iprt/formats/tar.h> 44 44 45 45 -
trunk/src/VBox/Runtime/common/zip/tarvfswriter.cpp
r98103 r98322 53 53 #include <iprt/zero.h> 54 54 55 #include "tar.h"55 #include <iprt/formats/tar.h> 56 56 57 57 #include "tarvfsreader.h" -
trunk/src/VBox/Runtime/include/internal/magics.h
r98103 r98322 238 238 /** Magic value for RTTCPSERVER::u32Magic. (Harlan Ellison) */ 239 239 #define RTUDPSERVER_MAGIC UINT32_C(0x19340527) 240 /** The value of RTTAR::u32Magic. (Donald Ervin Knuth) */241 #define RTTAR_MAGIC UINT32_C(0x19380110)242 /** The value of RTTAR::u32Magic after RTTarClose(). */243 #define RTTAR_MAGIC_DEAD ~RTTAR_MAGIC244 /** The value of RTTARFILE::u32Magic. (Abraham Stoker) */245 #define RTTARFILE_MAGIC UINT32_C(0x18471108)246 /** The value of RTTARFILE::u32Magic after RTTarFileClose(). */247 #define RTTARFILE_MAGIC_DEAD UINT32_C(0x19120420)248 240 /** RTTESTINT::u32Magic value. (Daniel Kehlmann) */ 249 241 #define RTTESTINT_MAGIC UINT32_C(0x19750113)
Note:
See TracChangeset
for help on using the changeset viewer.

