Skip to content

Commit afe16a7

Browse files
committed
runtime: rename appimage_fullpath to appimage_full_path
1 parent 51aa646 commit afe16a7

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/runtime.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ mkdir_p(const char* const path)
212212
}
213213

214214
void
215-
print_help(const char *appimage_fullpath)
215+
print_help(const char *appimage_full_path)
216216
{
217217
// TODO: "--appimage-list List content from embedded filesystem image\n"
218218
fprintf(stderr,
@@ -244,19 +244,19 @@ print_help(const char *appimage_fullpath)
244244
" and is neither moved nor renamed, the application contained inside this\n"
245245
" AppImage to store its data in this directory rather than in your home\n"
246246
" directory\n"
247-
, appimage_fullpath);
247+
, appimage_full_path);
248248
}
249249

250250
void
251-
portable_option(const char *arg, const char *appimage_fullpath, const char *name)
251+
portable_option(const char *arg, const char *appimage_full_path, const char *name)
252252
{
253253
char option[32];
254254
sprintf(option, "appimage-portable-%s", name);
255255

256256
if (arg && strcmp(arg, option)==0) {
257257
char portable_dir[PATH_MAX];
258258

259-
sprintf(portable_dir, "%s.%s", appimage_fullpath, name);
259+
sprintf(portable_dir, "%s.%s", appimage_full_path, name);
260260
if (!mkdir(portable_dir, S_IRWXU))
261261
fprintf(stderr, "Portable %s directory created at %s\n", name, portable_dir);
262262
else
@@ -578,20 +578,20 @@ int main(int argc, char *argv[]) {
578578
}
579579

580580
// calculate full path of AppImage
581-
char appimage_fullpath[PATH_MAX];
581+
char appimage_full_path[PATH_MAX];
582582

583583
if(getenv("TARGET_APPIMAGE") == NULL) {
584584
// If we are operating on this file itself, then we've already
585585
// expanded the symlink at `/proc/self/exe` in order to work
586586
// around the issue with gcompat described above
587-
strcpy(appimage_fullpath, appimage_path);
587+
strcpy(appimage_full_path, appimage_path);
588588
} else {
589589
char* abspath = realpath(appimage_path, NULL);
590590
if (abspath == NULL) {
591591
perror("Failed to obtain realpath for $TARGET_APPIMAGE");
592592
exit(EXIT_EXECERROR);
593593
}
594-
strcpy(appimage_fullpath, abspath);
594+
strcpy(appimage_full_path, abspath);
595595
free(abspath);
596596
}
597597

@@ -617,7 +617,7 @@ int main(int argc, char *argv[]) {
617617

618618
/* Print the help and then exit */
619619
if(arg && strcmp(arg,"appimage-help")==0) {
620-
print_help(appimage_fullpath);
620+
print_help(appimage_full_path);
621621
exit(0);
622622
}
623623

@@ -714,7 +714,7 @@ int main(int argc, char *argv[]) {
714714
new_argv[new_argc] = NULL;
715715

716716
/* Setting some environment variables that the app "inside" might use */
717-
setenv("APPIMAGE", appimage_fullpath, 1);
717+
setenv("APPIMAGE", appimage_full_path, 1);
718718
setenv("ARGV0", argv0_path, 1);
719719
setenv("APPDIR", prefix, 1);
720720

@@ -772,8 +772,8 @@ int main(int argc, char *argv[]) {
772772
exit(0);
773773
}
774774

775-
portable_option(arg, appimage_fullpath, "home");
776-
portable_option(arg, appimage_fullpath, "config");
775+
portable_option(arg, appimage_full_path, "home");
776+
portable_option(arg, appimage_full_path, "config");
777777

778778
// If there is an argument starting with appimage- (but not appimage-mount which is handled further down)
779779
// then stop here and print an error message
@@ -895,23 +895,23 @@ int main(int argc, char *argv[]) {
895895
}
896896

897897
/* Setting some environment variables that the app "inside" might use */
898-
setenv( "APPIMAGE", appimage_fullpath, 1 );
898+
setenv( "APPIMAGE", appimage_full_path, 1 );
899899
setenv( "ARGV0", argv0_path, 1 );
900900
setenv( "APPDIR", mount_dir, 1 );
901901

902902
char portable_home_dir[PATH_MAX];
903903
char portable_config_dir[PATH_MAX];
904904

905905
/* If there is a directory with the same name as the AppImage plus ".home", then export $HOME */
906-
strcpy (portable_home_dir, appimage_fullpath);
906+
strcpy (portable_home_dir, appimage_full_path);
907907
strcat (portable_home_dir, ".home");
908908
if(is_writable_directory(portable_home_dir)){
909909
fprintf(stderr, "Setting $HOME to %s\n", portable_home_dir);
910910
setenv("HOME",portable_home_dir,1);
911911
}
912912

913913
/* If there is a directory with the same name as the AppImage plus ".config", then export $XDG_CONFIG_HOME */
914-
strcpy (portable_config_dir, appimage_fullpath);
914+
strcpy (portable_config_dir, appimage_full_path);
915915
strcat (portable_config_dir, ".config");
916916
if(is_writable_directory(portable_config_dir)){
917917
fprintf(stderr, "Setting $XDG_CONFIG_HOME to %s\n", portable_config_dir);

0 commit comments

Comments
 (0)