cake
/
p7utils
Archived
1
0
Fork 0
Code

Adapted to new lib version

This commit is contained in:
Thomas Touhey 2017-01-27 00:10:39 +01:00
parent 09c95e1241
commit 5632e2d3ad
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p7/args.c
View File

@ -170,7 +170,7 @@ int parse_args(int ac, char **av, args_t *args)
.local = NULL, .force = 0,
.com = 0,
.storage = QUOTE(DEFAULT_STORAGE),
.initflags = P7_ACTIVE | P7_CHECK, .exitflags = P7_TERM};
.initflags = P7_ACTIVE | P7_CHECK | P7_TERM};
/* define options */
char short_options[] = "hvfo:d:t:#";
@ -219,7 +219,7 @@ int parse_args(int ac, char **av, args_t *args)
/* force no initialization */
case 'i': args->initflags &= ~P7_CHECK; break;
/* force no exit */
case 'e': args->exitflags &= ~P7_TERM; break;
case 'e': args->initflags &= ~P7_TERM; break;
/* in case of error */
case '?':

9
src/p7/main.c
View File

@ -143,13 +143,16 @@ static void sendfile_display(p7ushort_t id, p7ushort_t total)
* print_file_info:
* File listing callback.
*
* @arg cookie (unused)
* @arg dir the directory in which the file is stored (NULL if root)
* @arg name the filename
* @arg size the filesize
*/
static void print_file_info(const char *dir, const char *name, p7uint_t size)
static void print_file_info(void *cookie, const char *dir, const char *name,
p7uint_t size)
{
(void)cookie;
/* initialize buffer */
static char buf[45];
@ -228,7 +231,7 @@ int main(int ac, char **av)
args.storage);
break;
case mn_ls:
err = p7_lsfiles(handle, args.storage, &print_file_info);
err = p7_lsfiles(handle, args.storage, &print_file_info, NULL);
break;
case mn_reset:
err = p7_resetflash(handle, args.storage);
@ -272,7 +275,7 @@ int main(int ac, char **av)
if (args.local) fclose(args.local);
/* terminate communication and de-initialize libp7 */
p7_exit(handle, args.exitflags);
p7_exit(handle);
/* Then we're good */
return (0);

2
src/p7/main.h
View File

@ -34,7 +34,7 @@ typedef struct {
int force;
/* other options */
unsigned int initflags, exitflags;
unsigned int initflags;
int com; const char *storage;
} args_t;

11
src/p7os/main.c
View File

@ -49,6 +49,7 @@ static const char error_unsupported[] =
* @return return code (0 if OK)
*/
#define initflags (P7_ACTIVE | P7_CHECK | P7_TERM)
int main(int ac, char **av)
{
/* parse args */
@ -58,8 +59,8 @@ int main(int ac, char **av)
/* Initialize libp7 and communication */
p7_handle_t *handle = NULL; int err;
if (args.com) err = p7_cominit(&handle, P7_ACTIVE | P7_CHECK, args.com);
else err = p7_init(&handle, P7_ACTIVE | P7_CHECK);
if (args.com) err = p7_cominit(&handle, initflags, args.com);
else err = p7_init(&handle, initflags);
if (err) goto init_error;
/* prepare */
@ -79,8 +80,8 @@ int main(int ac, char **av)
sleep(1);
/* re-open the handle */
if (args.com) err = p7_cominit(&handle, P7_ACTIVE | P7_CHECK, args.com);
else err = p7_init(&handle, P7_ACTIVE | P7_CHECK);
if (args.com) err = p7_cominit(&handle, initflags, args.com);
else err = p7_init(&handle, initflags);
if (err) goto init_error;
}
@ -97,7 +98,7 @@ int main(int ac, char **av)
}
/* exit libp7 */
p7_exit(handle, 1);
p7_exit(handle);
/* then we're good */
return (0);

2
src/p7screen/main.c
View File

@ -160,7 +160,7 @@ int main(int ac, char **av)
}
/* close */
p7_exit(handle, 0);
p7_exit(handle);
/* everything went well */
return (0);