Relicense Sortix to the ISC license.
I hereby relicense all my work on Sortix under the ISC license as below.
All Sortix contributions by other people are already under this license,
are not substantial enough to be copyrightable, or have been removed.
All imported code from other projects is compatible with this license.
All GPL licensed code from other projects had previously been removed.
Copyright 2011-2016 Jonas 'Sortie' Termansen and contributors.
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2016-03-02 17:38:16 -05:00
|
|
|
/*
|
2016-08-09 19:29:04 -04:00
|
|
|
* Copyright (c) 2013, 2016 Jonas 'Sortie' Termansen.
|
Relicense Sortix to the ISC license.
I hereby relicense all my work on Sortix under the ISC license as below.
All Sortix contributions by other people are already under this license,
are not substantial enough to be copyrightable, or have been removed.
All imported code from other projects is compatible with this license.
All GPL licensed code from other projects had previously been removed.
Copyright 2011-2016 Jonas 'Sortie' Termansen and contributors.
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2016-03-02 17:38:16 -05:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*
|
|
|
|
* tix-execdiff.c
|
|
|
|
* Reports which files have had the executable bit changed between two trees.
|
|
|
|
*/
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
|
2016-05-15 10:32:38 -04:00
|
|
|
#include <assert.h>
|
2013-03-26 07:40:43 -04:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <dirent.h>
|
2016-08-09 19:29:04 -04:00
|
|
|
#include <err.h>
|
2013-03-26 07:40:43 -04:00
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <libgen.h>
|
2014-01-20 12:30:13 -05:00
|
|
|
#include <signal.h>
|
2013-03-26 07:40:43 -04:00
|
|
|
#include <stdarg.h>
|
2016-02-28 18:10:59 -05:00
|
|
|
#include <stdbool.h>
|
2013-03-26 07:40:43 -04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
DIR* fdopendupdir(int fd)
|
|
|
|
{
|
|
|
|
int newfd = dup(fd);
|
|
|
|
if ( newfd < 0 )
|
|
|
|
return NULL;
|
|
|
|
DIR* result = fdopendir(newfd);
|
|
|
|
if ( !result )
|
|
|
|
return close(newfd), (DIR*) NULL;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ftestexecutableat(int dirfd, const char* path)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
if ( fstatat(dirfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0 )
|
|
|
|
return -1;
|
|
|
|
if ( !S_ISREG(st.st_mode) )
|
|
|
|
return errno = EISDIR, -1;
|
|
|
|
if ( faccessat(dirfd, path, X_OK, AT_EACCESS | AT_SYMLINK_NOFOLLOW) == 0 )
|
|
|
|
return 1;
|
|
|
|
else if ( errno == EACCES )
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void execdiff(int tree_a, const char* tree_a_path,
|
|
|
|
int tree_b, const char* tree_b_path,
|
|
|
|
const char* relpath)
|
|
|
|
{
|
|
|
|
DIR* dir_b = fdopendupdir(tree_b);
|
|
|
|
if ( !dir_b )
|
2016-08-09 19:29:04 -04:00
|
|
|
err(1, "fdopendupdir(`%s`)", tree_b_path);
|
2016-02-28 18:10:59 -05:00
|
|
|
struct dirent* entry;
|
|
|
|
while ( (entry = readdir(dir_b)) )
|
2013-03-26 07:40:43 -04:00
|
|
|
{
|
|
|
|
if ( !strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..") )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
char* subrelpath = join_paths(relpath, entry->d_name);
|
|
|
|
|
|
|
|
int diropenflags = O_RDONLY | O_DIRECTORY | O_NOFOLLOW;
|
|
|
|
int subtree_b = openat(tree_b, entry->d_name, diropenflags);
|
|
|
|
if ( 0 <= subtree_b )
|
|
|
|
{
|
|
|
|
char* subtree_b_path = join_paths(tree_b_path, entry->d_name);
|
|
|
|
int subtree_a = openat(tree_a, entry->d_name, diropenflags);
|
|
|
|
if ( subtree_a < 0 )
|
|
|
|
{
|
|
|
|
if ( !(errno == ENOTDIR || errno == ELOOP || errno == ENOENT) )
|
2016-08-09 19:29:04 -04:00
|
|
|
err(1, "`%s/%s`", tree_b_path, entry->d_name);
|
2013-03-26 07:40:43 -04:00
|
|
|
execdiff(-1, NULL, subtree_b, subtree_b_path, subrelpath);
|
|
|
|
free(subtree_b_path);
|
|
|
|
close(subtree_b);
|
|
|
|
free(subrelpath);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
char* subtree_a_path = join_paths(tree_a_path, entry->d_name);
|
|
|
|
execdiff(subtree_a, subtree_a_path, subtree_b, subtree_b_path,
|
|
|
|
subrelpath);
|
|
|
|
free(subtree_a_path);
|
|
|
|
close(subtree_a);
|
|
|
|
free(subtree_b_path);
|
|
|
|
close(subtree_b);
|
|
|
|
free(subrelpath);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if ( !(errno == ENOTDIR || errno == ELOOP) )
|
2016-08-09 19:29:04 -04:00
|
|
|
err(1, "`%s/%s`", tree_b_path, entry->d_name);
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
int a_executableness = ftestexecutableat(tree_a, entry->d_name);
|
|
|
|
int b_executableness = ftestexecutableat(tree_b, entry->d_name);
|
|
|
|
|
|
|
|
if ( (a_executableness == 1) && (b_executableness == 0) )
|
|
|
|
{
|
|
|
|
printf("chmod -x -- '");
|
|
|
|
for ( size_t i = 0; subrelpath[i]; i++ )
|
|
|
|
if ( subrelpath[i] == '\'' )
|
|
|
|
printf("'\\''");
|
|
|
|
else
|
|
|
|
putchar(subrelpath[i]);
|
|
|
|
printf("'\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( (a_executableness != 1) && (b_executableness == 1) )
|
|
|
|
{
|
|
|
|
printf("chmod +x -- '");
|
|
|
|
for ( size_t i = 0; subrelpath[i]; i++ )
|
|
|
|
if ( subrelpath[i] == '\'' )
|
|
|
|
printf("'\\''");
|
|
|
|
else
|
|
|
|
putchar(subrelpath[i]);
|
|
|
|
printf("'\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
free(subrelpath);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
closedir(dir_b);
|
|
|
|
}
|
|
|
|
|
2015-07-29 19:08:49 -04:00
|
|
|
static void help(FILE* fp, const char* argv0)
|
2013-03-26 07:40:43 -04:00
|
|
|
{
|
|
|
|
fprintf(fp, "Usage: %s [OPTION]... TREE-A TREE-B\n", argv0);
|
|
|
|
fprintf(fp, "Reports which files have had the executable bit changed between two trees.\n");
|
|
|
|
}
|
|
|
|
|
2015-07-29 19:08:49 -04:00
|
|
|
static void version(FILE* fp, const char* argv0)
|
2013-03-26 07:40:43 -04:00
|
|
|
{
|
2015-07-29 19:08:49 -04:00
|
|
|
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
|
2013-03-26 07:40:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char* argv[])
|
|
|
|
{
|
|
|
|
const char* argv0 = argv[0];
|
|
|
|
for ( int i = 0; i < argc; i++ )
|
|
|
|
{
|
|
|
|
const char* arg = argv[i];
|
2015-07-29 19:08:49 -04:00
|
|
|
if ( arg[0] != '-' || !arg[1] )
|
2013-03-26 07:40:43 -04:00
|
|
|
continue;
|
|
|
|
argv[i] = NULL;
|
|
|
|
if ( !strcmp(arg, "--") )
|
|
|
|
break;
|
|
|
|
if ( arg[1] != '-' )
|
|
|
|
{
|
2016-02-28 18:10:59 -05:00
|
|
|
char c;
|
|
|
|
while ( (c = *++arg) ) switch ( c )
|
2013-03-26 07:40:43 -04:00
|
|
|
{
|
|
|
|
default:
|
2015-07-29 19:08:49 -04:00
|
|
|
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
|
2013-03-26 07:40:43 -04:00
|
|
|
help(stderr, argv0);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2015-07-29 19:08:49 -04:00
|
|
|
else if ( !strcmp(arg, "--help") )
|
|
|
|
help(stdout, argv0), exit(0);
|
|
|
|
else if ( !strcmp(arg, "--version") )
|
|
|
|
version(stdout, argv0), exit(0);
|
2013-03-26 07:40:43 -04:00
|
|
|
else
|
|
|
|
{
|
2015-07-29 19:08:49 -04:00
|
|
|
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
|
2013-03-26 07:40:43 -04:00
|
|
|
help(stderr, argv0);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( argc == 1 )
|
|
|
|
{
|
|
|
|
help(stdout, argv0);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2015-07-29 19:08:49 -04:00
|
|
|
compact_arguments(&argc, &argv);
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
if ( argc < 3 )
|
2016-08-09 19:29:04 -04:00
|
|
|
errx(1, "You need to specify two directories");
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
if ( 3 < argc )
|
2016-08-09 19:29:04 -04:00
|
|
|
errx(1, "extra operand");
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
const char* tree_a_path = argv[1];
|
|
|
|
int tree_a = open(tree_a_path, O_RDONLY | O_DIRECTORY);
|
|
|
|
if ( tree_a < 0 )
|
2016-08-09 19:29:04 -04:00
|
|
|
err(1, "`%s'", tree_a_path);
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
const char* tree_b_path = argv[2];
|
|
|
|
int tree_b = open(tree_b_path, O_RDONLY | O_DIRECTORY);
|
|
|
|
if ( tree_b < 0 )
|
2016-08-09 19:29:04 -04:00
|
|
|
err(1, "`%s'", tree_b_path);
|
2013-03-26 07:40:43 -04:00
|
|
|
|
|
|
|
execdiff(tree_a, tree_a_path, tree_b, tree_b_path, ".");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|