Skip to content

Use PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE for unknown file mode #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2016
Merged

Use PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE for unknown file mode #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ private ArchiveEntry asArchiveEntry( final AddedResourceCollection collection, f
{
final String destFileName = collection.resources.getName( resource );

int fromResource = -1;
int fromResource = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
if ( resource instanceof ResourceAttributeSupplier )
{
final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,14 @@ private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type,
this.type = type;
int permissions = mode;

if ( mode == -1 && this.attributes == null )
if ( mode == PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE && this.attributes == null )
{
permissions = resource.isFile() ? Archiver.DEFAULT_FILE_MODE
: resource.isSymbolicLink() ? Archiver.DEFAULT_SYMLILNK_MODE : Archiver.DEFAULT_DIR_MODE;
}

this.mode = permissions == -1 ? permissions : ( permissions & UnixStat.PERM_MASK ) |
this.mode = permissions == PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ? permissions
: ( permissions & UnixStat.PERM_MASK ) |
( type == FILE ? UnixStat.FILE_FLAG : type == SYMLINK ? UnixStat.LINK_FLAG : UnixStat.DIR_FLAG );

this.addSynchronously = ( collection != null && !collection.isConcurrentAccessSupported() );
Expand Down
34 changes: 19 additions & 15 deletions src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*/

import org.codehaus.plexus.archiver.*;
import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
import org.codehaus.plexus.util.StringUtils;
Expand Down Expand Up @@ -55,38 +56,39 @@ public void createArchive()
public void addDirectory( final @Nonnull File directory )
throws ArchiverException
{
added.add( new Addition( directory, null, null, null, -1 ) );
added.add( new Addition( directory, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addDirectory( final @Nonnull File directory, final String prefix )
throws ArchiverException
{
added.add( new Addition( directory, prefix, null, null, -1 ) );
added.add( new Addition( directory, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addDirectory( final @Nonnull File directory, final String[] includes, final String[] excludes )
throws ArchiverException
{
added.add( new Addition( directory, null, includes, excludes, -1 ) );
added.add( new Addition( directory, null, includes, excludes, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addDirectory( final @Nonnull File directory, final String prefix, final String[] includes,
final String[] excludes )
throws ArchiverException
{
added.add( new Addition( directory, prefix, includes, excludes, -1 ) );
added.add( new Addition( directory, prefix, includes, excludes,
PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addFileSet( final @Nonnull FileSet fileSet )
throws ArchiverException
{
added.add( new Addition( fileSet, null, null, null, -1 ) );
added.add( new Addition( fileSet, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName )
throws ArchiverException
{
added.add( new Addition( inputFile, destFileName, null, null, -1 ) );
added.add( new Addition( inputFile, destFileName, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName, final int permissions )
Expand All @@ -98,51 +100,53 @@ public void addFile( final @Nonnull File inputFile, final @Nonnull String destFi
public void addArchivedFileSet( final @Nonnull File archiveFile )
throws ArchiverException
{
added.add( new Addition( archiveFile, null, null, null, -1 ) );
added.add( new Addition( archiveFile, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix )
throws ArchiverException
{
added.add( new Addition( archiveFile, prefix, null, null, -1 ) );
added.add( new Addition( archiveFile, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addSymlink( String s, String s2 )
throws ArchiverException
{
added.add( new Addition( s, null, null, null, -1 ) );
added.add( new Addition( s, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addSymlink( String s, int i, String s2 )
throws ArchiverException
{
added.add( new Addition( s, null, null, null, -1 ) );
added.add( new Addition( s, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );

}

public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
throws ArchiverException
{
added.add( new Addition( archiveFile, null, includes, excludes, -1 ) );
added.add( new Addition( archiveFile, null, includes, excludes,
PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix, final String[] includes,
final String[] excludes )
throws ArchiverException
{
added.add( new Addition( archiveFile, prefix, includes, excludes, -1 ) );
added.add( new Addition( archiveFile, prefix, includes, excludes,
PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addArchivedFileSet( final ArchivedFileSet fileSet )
throws ArchiverException
{
added.add( new Addition( fileSet, null, null, null, -1 ) );
added.add( new Addition( fileSet, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addArchivedFileSet( final ArchivedFileSet fileSet, Charset charset )
throws ArchiverException
{
added.add( new Addition( fileSet, null, null, null, -1 ) );
added.add( new Addition( fileSet, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
Expand All @@ -154,7 +158,7 @@ public void addResource( final PlexusIoResource resource, final String destFileN
public void addResources( final PlexusIoResourceCollection resources )
throws ArchiverException
{
added.add( new Addition( resources, null, null, null, -1 ) );
added.add( new Addition( resources, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
}

public File getDestFile()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private static long getLastModofied( ZipArchiveEntry entry )

public synchronized PlexusIoResourceAttributes getAttributes()
{
int mode = -1;
int mode = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
if (entry.getPlatform() == ZipArchiveEntry.PLATFORM_UNIX)
{
mode = entry.getUnixMode();
Expand Down