archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8321274: Rename ZipEntry.extraAttributes to ZipEntry.externalFileAttributes

Browse source 
Reviewed-by: lancea, jpai
This commit is contained in:
Eirik Bjørsnøs 2024-07-03 04:36:32 +00:00 • committed by Jaikiran Pai
parent fac74b118f
commit d51141e5fc
12 changed files with 52 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/util/zip/ZipEntry.java
View file

@ -59,7 +59,7 @@ public class ZipEntry implements ZipConstants, Cloneable {
int flag = 0; // general purpose flag
byte[] extra; // optional extra field data for entry
String comment; // optional comment string for entry
int extraAttributes = -1; // e.g. POSIX permissions, sym links.
int externalFileAttributes = -1; // File type, setuid, setgid, sticky, POSIX permissions
/**
* Compression method for uncompressed entries.
*/
@ -134,7 +134,7 @@ public class ZipEntry implements ZipConstants, Cloneable {
flag = e.flag;
extra = e.extra;
comment = e.comment;
extraAttributes = e.extraAttributes;
externalFileAttributes = e.externalFileAttributes;
}
/**

10
src/java.base/share/classes/java/util/zip/ZipFile.java
View file

@ -697,7 +697,7 @@ public class ZipFile implements ZipConstants, Closeable {
e.method = CENHOW(cen, pos);
if (CENVEM_FA(cen, pos) == FILE_ATTRIBUTES_UNIX) {
// read all bits in this field, including sym link attributes
e.extraAttributes = CENATX_PERMS(cen, pos) & 0xFFFF;
e.externalFileAttributes = CENATX_PERMS(cen, pos) & 0xFFFF;
}
if (elen != 0) {
@ -1165,12 +1165,12 @@ public class ZipFile implements ZipConstants, Closeable {
return zip.entryNameStream();
}
@Override
public int getExtraAttributes(ZipEntry ze) {
return ze.extraAttributes;
public int getExternalFileAttributes(ZipEntry ze) {
return ze.externalFileAttributes;
}
@Override
public void setExtraAttributes(ZipEntry ze, int extraAttrs) {
ze.extraAttributes = extraAttrs;
public void setExternalFileAttributes(ZipEntry ze, int externalFileAttributes) {
ze.externalFileAttributes = externalFileAttributes;
}
}

4
src/java.base/share/classes/java/util/zip/ZipOutputStream.java
View file

@ -541,7 +541,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
* to a version value.
*/
private int versionMadeBy(ZipEntry e, int version) {
return (e.extraAttributes < 0) ? version :
return (e.externalFileAttributes < 0) ? version :
VERSION_MADE_BY_BASE_UNIX | (version & 0xff);
}
@ -637,7 +637,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
writeShort(0); // starting disk number
writeShort(0); // internal file attributes (unused)
// extra file attributes, used for storing posix permissions etc.
writeInt(e.extraAttributes > 0 ? e.extraAttributes << 16 : 0);
writeInt(e.externalFileAttributes > 0 ? e.externalFileAttributes << 16 : 0);
writeInt(offset); // relative offset of local header
writeBytes(nameBytes, 0, nameBytes.length);

6
src/java.base/share/classes/jdk/internal/access/JavaUtilZipFileAccess.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,7 @@ public interface JavaUtilZipFileAccess {
public Enumeration<JarEntry> entries(ZipFile zip);
public Stream<JarEntry> stream(ZipFile zip);
public Stream<String> entryNameStream(ZipFile zip);
public void setExtraAttributes(ZipEntry ze, int extraAttrs);
public int getExtraAttributes(ZipEntry ze);
public void setExternalFileAttributes(ZipEntry ze, int externalFileAttributes);
public int getExternalFileAttributes(ZipEntry ze);
}