Commit 702499e3-b32a-4fe5-8b10-f38c82cd1f3b/upstream/master - magicrescue

+66

-0

.github/workflows/codeql-analysis.yml less more

	0	# For most projects, this workflow file will not need changing; you simply need
	1	# to commit it to your repository.
	2	#
	3	# You may wish to alter this file to override the set of languages analyzed,
	4	# or to provide custom queries or build logic.
	5	#
	6	# ****** NOTE ******
	7	# We have attempted to detect the languages in your repository. Please check
	8	# the `language` matrix defined below to confirm you have the correct set of
	9	# supported CodeQL languages.
	10	#
	11	name: "CodeQL"
	12
	13	on:
	14	push:
	15	branches: [ main ]
	16	pull_request:
	17	# The branches below must be a subset of the branches above
	18	branches: [ main ]
	19	workflow_dispatch:
	20
	21	jobs:
	22	analyze:
	23	name: Analyze
	24	runs-on: ubuntu-latest
	25
	26	strategy:
	27	fail-fast: false
	28	matrix:
	29	language: [ 'cpp' ]
	30	# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
	31	# Learn more:
	32	# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
	33
	34	steps:
	35	- name: Checkout repository
	36	uses: actions/checkout@v2
	37
	38	# Initializes the CodeQL tools for scanning.
	39	- name: Initialize CodeQL
	40	uses: github/codeql-action/init@v1
	41	with:
	42	languages: ${{ matrix.language }}
	43	# If you wish to specify custom queries, you can do so here or in a config file.
	44	# By default, queries listed here will override any specified in a config file.
	45	# Prefix the list here with "+" to use these queries and those in the config file.
	46	# queries: ./path/to/local/query, your-org/your-repo/queries@main
	47
	48	# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
	49	# If this step fails, then you should remove it and run the build manually (see below)
	50	- name: Autobuild
	51	uses: github/codeql-action/autobuild@v1
	52
	53	# ℹ️ Command-line programs to run using the OS shell.
	54	# 📚 https://git.io/JvXDl
	55
	56	# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
	57	# and modify them (or add more) to build your code if your project
	58	# uses a compiled language
	59
	60	#- run: \|
	61	# make bootstrap
	62	# make release
	63
	64	- name: Perform CodeQL Analysis
	65	uses: github/codeql-action/analyze@v1

+19

-0

.github/workflows/tests.yml less more

	0	name: Run test suite
	1	on:
	2	push:
	3	pull_request:
	4	workflow_dispatch:
	5	jobs:
	6	run-test-suite:
	7	name: Build and test
	8	runs-on: ubuntu-latest
	9	steps:
	10	- name: Check out repository code
	11	uses: actions/checkout@v2
	12	with:
	13	fetch-depth: 1
	14	- run: ./configure
	15	- run: make
	16	- run: sudo apt-get update -y
	17	- run: sudo apt-get install -y --no-install-recommends libfile-slurp-perl libjpeg-turbo-progs mencoder
	18	- run: tests/tests.pl

+9

-9

Makefile.in less more

55	55	maintainer-clean: distclean docs-clean
56	56
57	57	install: all
58		mkdir -p $(INSTALLDIR)/share/magicrescue/tools \
	58	mkdir -p $(INSTALLDIR)/libexec/magicrescue/tools \
59	59	$(INSTALLDIR)/share/magicrescue/recipes \
60		$(INSTALLDIR)/man/man1 \
	60	$(INSTALLDIR)/share/man/man1 \
61	61	$(INSTALLDIR)/bin
62	62
63	63	cp magicrescue$(EXE) dupemap$(EXE) magicsort $(INSTALLDIR)/bin/
64	64	cp recipes/* $(INSTALLDIR)/share/magicrescue/recipes/
65		cp $(DOCS) $(INSTALLDIR)/man/man1
	65	cp $(DOCS) $(INSTALLDIR)/share/man/man1
66	66
67	67	for f in tools/*; do \
68	68	if [ -x "$$f" ]; then \
69		cp -f "$$f" $(INSTALLDIR)/share/magicrescue/tools/; \
	69	cp -f "$$f" $(INSTALLDIR)/libexec/magicrescue/tools/; \
70	70	fi; \
71	71	done
72		cp -f tools/laola.pl $(INSTALLDIR)/share/magicrescue/tools/
	72	cp -f tools/laola.pl $(INSTALLDIR)/libexec/magicrescue/tools/
	73	chmod 755 $(INSTALLDIR)/libexec/magicrescue/tools/laola.pl
73	74
74	75	uninstall:
75	76	rm -f $(INSTALLDIR)/bin/magicrescue$(EXE)
76	77	rm -f $(INSTALLDIR)/bin/dupemap$(EXE)
77	78	rm -f $(INSTALLDIR)/bin/magicsort
78	79	for f in $(DOCS); do \
79		rm -f "$(INSTALLDIR)/man/man1/`basename $$f`"; \
	80	rm -f "$(INSTALLDIR)/share/man/man1/`basename $$f`"; \
80	81	done
81		rm -rf $(INSTALLDIR)/share/magicrescue/tools
82		rm -rf $(INSTALLDIR)/share/magicrescue/recipes
83		-rmdir $(INSTALLDIR)/share/magicrescue
	82	rm -rf $(INSTALLDIR)/libexec/magicrescue/
	83	rm -rf $(INSTALLDIR)/share/magicrescue/
84	84
85	85	.PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs
86	86

+3

-0

NEWS less more

	0	- Modernize installed file locations. In particular, this avoids installing
	1	binaries under `/usr/share`. Thanks to eriberto@debian.org.
	2
0	3	Version 1.1.10: Sat 24 Nov 20:17:42 CET 2018
1	4	- Recipe for FLV (Flash Video) files
2	5	- Recipe for Empathy chat message history files

+1

-1

config.d/80magicrescue_defs less more

0	0	#!/bin/sh
1	1
2	2	cat >> config.h << EOF
3		#define COMMAND_PATH "$prefix/share/magicrescue/tools"
	3	#define COMMAND_PATH "$prefix/libexec/magicrescue/tools"
4	4	#define RECIPE_PATH "$prefix/share/magicrescue/recipes"
5	5	#include "largefile.h"
6	6	EOF

~~tests/samples/gimp-xcf~~ less more

Binary diff not shown

+71

-0

tests/src/elf.c less more

	0	/* Exit with a status code indicating success.
	1	Copyright (C) 1999-2003 Free Software Foundation, Inc.
	2
	3	This program is free software; you can redistribute it and/or modify
	4	it under the terms of the GNU General Public License as published by
	5	the Free Software Foundation; either version 2, or (at your option)
	6	any later version.
	7
	8	This program is distributed in the hope that it will be useful,
	9	but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	GNU General Public License for more details.
	12
	13	You should have received a copy of the GNU General Public License
	14	along with this program; if not, write to the Free Software Foundation,
	15	Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
	16
	17	#include <config.h>
	18	#include <stdio.h>
	19	#include <sys/types.h>
	20	#include "system.h"
	21
	22	#define PROGRAM_NAME "true"
	23	#define AUTHORS "Jim Meyering"
	24
	25	/* The name this program was run with. */
	26	char *program_name;
	27
	28	void
	29	usage (int status)
	30	{
	31	printf (_("\
	32	Usage: %s [ignored command line arguments]\n\
	33	or: %s OPTION\n\
	34	Exit with a status code indicating success.\n\
	35	\n\
	36	These option names may not be abbreviated.\n\
	37	\n\
	38	"),
	39	program_name, program_name);
	40	fputs (HELP_OPTION_DESCRIPTION, stdout);
	41	fputs (VERSION_OPTION_DESCRIPTION, stdout);
	42	printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
	43	exit (status);
	44	}
	45
	46	int
	47	main (int argc, char **argv)
	48	{
	49	initialize_main (&argc, &argv);
	50	program_name = argv[0];
	51	setlocale (LC_ALL, "");
	52	bindtextdomain (PACKAGE, LOCALEDIR);
	53	textdomain (PACKAGE);
	54
	55	atexit (close_stdout);
	56
	57	/* Recognize --help or --version only if it's the only command-line
	58	argument and if POSIXLY_CORRECT is not set. */
	59	if (argc == 2 && getenv ("POSIXLY_CORRECT") == NULL)
	60	{
	61	if (STREQ (argv[1], "--help"))
	62	usage (EXIT_SUCCESS);
	63
	64	if (STREQ (argv[1], "--version"))
	65	version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS,
	66	(char *) NULL);
	67	}
	68
	69	exit (EXIT_SUCCESS);
	70	}

+1

-1

tools/safecat.c less more

71	71	}
72	72	}
73	73
74		if (argc - optind != 1 \|\| strcmp(argv[optind], "--help") == 0) {
	74	if (argc - optind != 1) {
75	75	usage();
76	76	return 1;
77	77	}

+5

-5

tools/textextract.c less more

316	316
317	317	int c, outfd;
318	318
319		if (argc < 2 \|\| strcmp(argv[1], "--help") == 0) {
320		usage();
321		return 1;
322		}
323
324	319	while ((c = getopt(argc, argv, "M:s:b:l:r:")) >= 0) {
325	320	switch (c) {
326	321	case 'M':

350	345	}
351	346	}
352	347
	348	if (argc - optind != 1) {
	349	usage();
	350	return 1;
	351	}
	352
353	353	if (strcmp(argv[optind], "-") == 0) {
354	354	outfd = 1;
355	355	} else if ((outfd =