return 0;
}
-int do_require( const char *package )
+int do_require( const char *package, const char *path )
{
int stat = 1;
lar_archive *ar;
lar_member *mb;
- if( (ar = lar_find_archive(package)) != NULL )
+ if( (ar = lar_find_archive(package, path)) != NULL )
{
if( (mb = lar_find_member(ar, package)) != NULL )
{
break;
case 'r':
- stat = do_require(argv[2]);
+ stat = do_require(argv[2], argv[3]);
break;
}
{
printf("Usage:\n");
printf("\tlar show <archive> [<member>]\n");
- printf("\tlar require <package>\n");
+ printf("\tlar require <package> [<path>]\n");
return 1;
}
idx_map = NULL;
for( i = 0; i < idx_length; \
- i += (sizeof(lar_index) - sizeof(char))
+ i += (sizeof(lar_index) - sizeof(char *))
) {
idx_ptr = (lar_index *)malloc(sizeof(lar_index));
return 0;
}
-lar_archive * lar_find_archive( const char *package )
+lar_archive * lar_find_archive( const char *package, const char *path )
{
int seg = 1;
- int i, j, len;
+ int len = 0;
+ int pln = 0;
+ int i, j;
struct stat s;
LAR_FNAME(buffer);
+ if( path )
+ {
+ for( pln = 0; path[pln] != '\0'; pln++ )
+ if( pln >= (sizeof(buffer) - 5) )
+ LAR_DIE("Library path exceeds maximum allowed length");
+
+ memcpy(buffer, path, pln);
+ }
+
for( len = 0; package[len] != '\0'; len++ )
{
- if( len >= (sizeof(buffer) - 5) )
+ if( len >= (sizeof(buffer) - 5 - pln) )
LAR_DIE("Package name exceeds maximum allowed length");
if( package[len] == '.' ) seg++;
if( j < seg ) j++; else break;
}
- buffer[i] = ( package[i] == '.' ) ? LAR_DIRSEP : package[i];
+ buffer[pln+i] = ( package[i] == '.' ) ? LAR_DIRSEP : package[i];
}
- buffer[i+0] = '.'; buffer[i+1] = 'l'; buffer[i+2] = 'a';
- buffer[i+3] = 'r'; buffer[i+4] = '\0';
+ buffer[pln+i+0] = '.'; buffer[pln+i+1] = 'l'; buffer[pln+i+2] = 'a';
+ buffer[pln+i+3] = 'r'; buffer[pln+i+4] = '\0';
if( (stat(buffer, &s) > -1) && (s.st_mode & S_IFREG) )
return lar_open(buffer);
#include <stdint.h>
#include <fcntl.h>
#include <string.h>
+#include <errno.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
-int errno;
-
#define LAR_DIE(s) \
do { \
fprintf(stderr, "%s(%i): %s(): %s\n", \
int lar_close( lar_archive *ar );
-lar_archive * lar_find_archive( const char *package );
+lar_archive * lar_find_archive( const char *package, const char *path );
lar_member * lar_find_member( lar_archive *ar, const char *package );
#endif
-
}
}
-
+my $count = 1;
foreach my $file ( @index )
{
- warn sprintf "Index: 0x%08X 0x%08X 0x%08X 0x%08X\n", $file->[0], $file->[1], $file->[2], $file->[3];
+ warn sprintf "Index[%4d]: 0x%08X 0x%08X 0x%08X 0x%08X\n", $count++, $file->[0], $file->[1], $file->[2], $file->[3];
print pack "NNNNnn", $file->[0], $file->[1], $file->[2], $file->[3], 0x0000, 0x0000;
}