NotificationsYou must be signed in to change notification settings
Fork91
Star761

Commite163c45

committed

Rename dubious pg_probackup variable into PROGRAM_NAME_FULL

1 parent66ad282 commite163c45Copy full SHA for e163c45

File tree

3 files changed

+13

-13

lines changed

src
- pg_probackup.c
- pg_probackup.h
- utils
  - remote.c

3 files changed

+13

-13

lines changed

`‎src/pg_probackup.c‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@`
`20`	`20`	`#include"utils/thread.h"`
`21`	`21`	`#include<time.h>`
`22`	`22`
`23`		`-constchar*PROGRAM_NAME=NULL;`
	`23`	`+constcharPROGRAM_NAME=NULL;/ PROGRAM_NAME_FULL without .exe suffix`
	`24`	`+ * if any */`
	`25`	`+constchar*PROGRAM_NAME_FULL=NULL;`
`24`	`26`	`constchar*PROGRAM_FULL_PATH=NULL;`
`25`	`27`	`constchar*PROGRAM_URL="https://github.com/postgrespro/pg_probackup";`
`26`	`28`	`constchar*PROGRAM_EMAIL="https://github.com/postgrespro/pg_probackup/issues";`
`@@ -45,8 +47,6 @@ typedef enum ProbackupSubcmd`
`45`	`47`	`}ProbackupSubcmd;`
`46`	`48`
`47`	`49`
`48`		`-charpg_probackup;/ Program name (argv[0]) */`
`49`		`-`
`50`	`50`	`/* directory options */`
`51`	`51`	`char*backup_path=NULL;`
`52`	`52`	`/*`
`@@ -235,7 +235,7 @@ main(int argc, char *argv[])`
`235`	`235`	`structstatstat_buf;`
`236`	`236`	`intrc;`
`237`	`237`
`238`		`-pg_probackup=argv[0];`
	`238`	`+PROGRAM_NAME_FULL=argv[0];`
`239`	`239`
`240`	`240`	`/* Initialize current backup */`
`241`	`241`	`pgBackupInit(&current);`

`‎src/pg_probackup.h‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`
`37`	`37`	`/* pgut client variables and full path */`
`38`	`38`	`externconstchar*PROGRAM_NAME;`
	`39`	`+externconstchar*PROGRAM_NAME_FULL;`
`39`	`40`	`externconstchar*PROGRAM_FULL_PATH;`
`40`	`41`	`externconstchar*PROGRAM_URL;`
`41`	`42`	`externconstchar*PROGRAM_EMAIL;`
`@@ -412,7 +413,6 @@ typedef struct BackupPageHeader`
`412`	`413`	`#defineIsSshProtocol() (instance_config.remote.host && strcmp(instance_config.remote.proto, "ssh") == 0)`
`413`	`414`
`414`	`415`	`/* directory options */`
`415`		`-externchar*pg_probackup;`
`416`	`416`	`externchar*backup_path;`
`417`	`417`	`externcharbackup_instance_path[MAXPGPATH];`
`418`	`418`	`externchararclog_path[MAXPGPATH];`
`@@ -472,7 +472,7 @@ extern const char *pgdata_exclude_dir[];`
`472`	`472`
`473`	`473`	`/* in backup.c */`
`474`	`474`	`externintdo_backup(time_tstart_time,boolno_validate);`
`475`		`-externvoiddo_checkdb(boolneed_amcheck,ConnectionOptionsconn_opt,`
	`475`	`+externvoiddo_checkdb(boolneed_amcheck,ConnectionOptionsconn_opt,`
`476`	`476`	`char*pgdata);`
`477`	`477`	`externBackupModeparse_backup_mode(constchar*value);`
`478`	`478`	`externconstchar*deparse_backup_mode(BackupModemode);`

`‎src/utils/remote.c‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ bool launch_agent(void)`
`91`	`91`
`92`	`92`	`ssh_argc=0;`
`93`	`93`	`#ifdefWIN32`
`94`		`-ssh_argv[ssh_argc++]=pg_probackup;`
	`94`	`+ssh_argv[ssh_argc++]=PROGRAM_NAME_FULL;`
`95`	`95`	`ssh_argv[ssh_argc++]="ssh";`
`96`	`96`	`ssh_argc+=2;/* reserve space for pipe descriptors */`
`97`	`97`	`#endif`
`@@ -129,7 +129,7 @@ bool launch_agent(void)`
`129`	`129`
`130`	`130`	`if (instance_config.remote.path)`
`131`	`131`	`{`
`132`		`-charconst*probackup=pg_probackup;`
	`132`	`+charconst*probackup=PROGRAM_NAME_FULL;`
`133`	`133`	`char*sep=strrchr(probackup,'/');`
`134`	`134`	`if (sep!=NULL) {`
`135`	`135`	`probackup=sep+1;`
`@@ -141,25 +141,25 @@ bool launch_agent(void)`
`141`	`141`	`probackup=sep+1;`
`142`	`142`	`}`
`143`	`143`	`}`
`144`		`-if (needs_quotes(instance_config.remote.path)\|\|needs_quotes(pg_probackup))`
	`144`	`+if (needs_quotes(instance_config.remote.path)\|\|needs_quotes(PROGRAM_NAME_FULL))`
`145`	`145`	`snprintf(cmd,sizeof(cmd),"\"%s\\%s\" agent %s",`
`146`	`146`	`instance_config.remote.path,probackup,PROGRAM_VERSION);`
`147`	`147`	`else`
`148`	`148`	`snprintf(cmd,sizeof(cmd),"%s\\%s agent %s",`
`149`	`149`	`instance_config.remote.path,probackup,PROGRAM_VERSION);`
`150`	`150`	`#else`
`151`		`-if (needs_quotes(instance_config.remote.path)\|\|needs_quotes(pg_probackup))`
	`151`	`+if (needs_quotes(instance_config.remote.path)\|\|needs_quotes(PROGRAM_NAME_FULL))`
`152`	`152`	`snprintf(cmd,sizeof(cmd),"\"%s/%s\" agent %s",`
`153`	`153`	`instance_config.remote.path,probackup,PROGRAM_VERSION);`
`154`	`154`	`else`
`155`	`155`	`snprintf(cmd,sizeof(cmd),"%s/%s agent %s",`
`156`	`156`	`instance_config.remote.path,probackup,PROGRAM_VERSION);`
`157`	`157`	`#endif`
`158`	`158`	`}else {`
`159`		`-if (needs_quotes(pg_probackup))`
`160`		`-snprintf(cmd,sizeof(cmd),"\"%s\" agent %s",pg_probackup,PROGRAM_VERSION);`
	`159`	`+if (needs_quotes(PROGRAM_NAME_FULL))`
	`160`	`+snprintf(cmd,sizeof(cmd),"\"%s\" agent %s",PROGRAM_NAME_FULL,PROGRAM_VERSION);`
`161`	`161`	`else`
`162`		`-snprintf(cmd,sizeof(cmd),"%s agent %s",pg_probackup,PROGRAM_VERSION);`
	`162`	`+snprintf(cmd,sizeof(cmd),"%s agent %s",PROGRAM_NAME_FULL,PROGRAM_VERSION);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`#ifdefWIN32`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite163c45

File tree

3 files changed

3 files changed

`‎src/pg_probackup.c‎`

`‎src/pg_probackup.h‎`

`‎src/utils/remote.c‎`

0 commit comments