Skip to content

Commit

Permalink
Change signature of main to something more standard
Browse files Browse the repository at this point in the history
This changes the signature of the main() function in the challenges and
POVs to be "int main(int cgc_argc, char *cgc_argv[])". The argument
names were chosen to avoid conflicts with challenges that use the names
argc/argv for their own purposes.

This should help out some analysis tools (specifically KLEE) that expect
main() to have at least two arguments.

This commit doesn't touch challenges that already had arguments to main.
Such challenges need a bit more careful handling, since they expect the
address of the flag page to be passed in the first argument.
  • Loading branch information
moyix authored and krx committed Jul 13, 2017
1 parent d17f713 commit de38869
Show file tree
Hide file tree
Showing 1,020 changed files with 1,021 additions and 1,021 deletions.
2 changes: 1 addition & 1 deletion challenges/3D_Image_Toolkit/pov_1/pov.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void *cgc_memcpy( void *pDest, const void *pSource, cgc_size_t nbytes )
return (pDestReturn);
}

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
// negotiate
type2_vals t2vals;
cgc_type2_negotiate(&t2vals);
Expand Down
2 changes: 1 addition & 1 deletion challenges/3D_Image_Toolkit/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void cgc_menu() {
cgc_free(px_list);
}

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_printf("3D Coordinates (3DC) Image File Format Tools\n");

Expand Down
2 changes: 1 addition & 1 deletion challenges/AIS-Lite/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/AIS-Lite/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define INVALID_MSG "INVALID MESSAGE."
#define PARTIAL_MSG "PARTIAL AIS MESSAGE."

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
char ret = SUCCESS;
int bytes_received = 0;

Expand Down
2 changes: 1 addition & 1 deletion challenges/ASCII_Content_Server/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASCII_Content_Server/pov_2/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASCII_Content_Server/pov_3/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASCII_Content_Server/pov_4/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASCII_Content_Server/pov_5/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASCII_Content_Server/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ THE SOFTWARE.
#include "cgc_command.h"

// Runs the ASCII Content Server
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
// Initialize server
if (cgc_InitializeTree() != 0) {
cgc_PrintErrorAndTerminate("Initialize server failed");
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASL6parse/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASL6parse/pov_2/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASL6parse/pov_3/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/ASL6parse/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static int cgc_read_exactly(int fd, uint8_t *buf, cgc_size_t n)
return 0;
}

int main(void)
int main(int cgc_argc, char *cgc_argv[])
{
unsigned size = 0;
cgc_size_t cgc_read = 0;
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/cb_1/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void gen_ok(void) {
}
}

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_ssize_t ret = 0;
DBG("STARTING.\n");
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/cb_2/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "cgc_libc.h"
#include "cgc_player.h"

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_ssize_t ret = 0;
DBG("STARTING.\n");
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/cb_3/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "cgc_libc.h"
#include "cgc_player.h"

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_ssize_t ret = 0;
DBG("STARTING.\n");
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/cb_4/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "cgc_libc.h"
#include "cgc_player.h"

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_ssize_t ret = 0;
DBG("STARTING.\n");
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/cb_5/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "cgc_libc.h"
#include "cgc_player.h"

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_ssize_t ret = 0;
DBG("STARTING.\n");
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/cb_6/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "cgc_libc.h"
#include "cgc_player.h"

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {

cgc_ssize_t ret = 0;
DBG("STARTING.\n");
Expand Down
2 changes: 1 addition & 1 deletion challenges/A_Game_of_Chance/pov_1/pov_1.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ unsigned char cgc_enough_cards(unsigned int idx, unsigned int len) {
return 0;
}

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type2();

/* Send Deck cmd, size, deck content */
Expand Down
2 changes: 1 addition & 1 deletion challenges/Accel/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Accel/pov_2/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/Accel/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static int cgc_parse_line(char *line)
return EXIT_CODE;
}

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
char line[LINE_SIZE];
cgc_init_sheet();
int cgc_exit = 0;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Audio_Visualizer/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Audio_Visualizer/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ int cgc_select_option(uwfc_t **track) {
return 1;
}

int main() {
int main(int cgc_argc, char *cgc_argv[]) {
uwfc_t *current_track = NULL;
int code = 1;
complex_t *dft_out;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Azurad/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "libpov.h"

int main(void)
int main(int cgc_argc, char *cgc_argv[])
{
type2_vals t2;
cgc_type2_negotiate(&t2);
Expand Down
2 changes: 1 addition & 1 deletion challenges/BIRC/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "libpov.h"

int main()
int main(int cgc_argc, char *cgc_argv[])
{
unsigned char exploit[] = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\x0c\"8N";
char admin_name[] = {12, 34, 56, 78 };
Expand Down
2 changes: 1 addition & 1 deletion challenges/Barcoder/pov_1/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void cgc_negotiate_type_2()
cgc__terminate(0);
}

int main()
int main(int cgc_argc, char *cgc_argv[])
{
cgc_negotiate_type_2();

Expand Down
2 changes: 1 addition & 1 deletion challenges/Barcoder/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void cgc_check_seed()
cgc_fwrite((void *)0x4347c000, 0x1000, cgc_stdout);
}

int main()
int main(int cgc_argc, char *cgc_argv[])
{
//barcode_128_t *cur_barcode;
int running = 1;
Expand Down
2 changes: 1 addition & 1 deletion challenges/BitBlaster/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/BitBlaster/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ int cgc_isWinner()
return (1);
}

int main(void)
int main(int cgc_argc, char *cgc_argv[])
{
uint8_t temp;

Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/pov_2/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/pov_3/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/pov_4/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/pov_5/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/pov_6/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Bloomy_Sunday/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void cgc_init()
cgc_bloomy_add(bloomy, depressing_words[i]);
}

int main()
int main(int cgc_argc, char *cgc_argv[])
{
uint8_t good = 0;
char buf[8], lyrics[2048];
Expand Down
2 changes: 1 addition & 1 deletion challenges/Blubber/pov_1/pov.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static void cgc_strcat(char* s1, const char* s2)
cgc_strcpy(p, s2);
}

int main(void)
int main(int cgc_argc, char *cgc_argv[])
{

#ifndef DEBUG
Expand Down
2 changes: 1 addition & 1 deletion challenges/Board_Game/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
unsigned char *read_00000;
Expand Down
2 changes: 1 addition & 1 deletion challenges/Board_Game/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ THE SOFTWARE.
// current player
char cgc_CURR_PLAYER[6];

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
char srcx, srcy, dstx, dsty;
// board
char board[X_MAX][Y_MAX];
Expand Down
2 changes: 1 addition & 1 deletion challenges/BudgIT/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/BudgIT/pov_2/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/BudgIT/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void cgc_sendReport(Map *map) {
cgc__terminate(TRANSMIT_ERROR);
}

int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
Map* map=NULL;
unsigned long instruction;
char key[MAX_KEY_SIZE+1];
Expand Down
2 changes: 1 addition & 1 deletion challenges/CGC_Board/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/CGC_Board/pov_2/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/CGC_Board/pov_3/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/CGC_File_System/pov_1/pov.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libpov.h"
int main(void) {
int main(int cgc_argc, char *cgc_argv[]) {
cgc_negotiate_type1(0x0, 0x0, 0);
do {
//*** writing data
Expand Down
2 changes: 1 addition & 1 deletion challenges/CGC_File_System/src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void cgc_service_loop( void )
}


int main(void)
int main(int cgc_argc, char *cgc_argv[])
{
cgc_service_loop();

Expand Down
Loading

0 comments on commit de38869

Please sign in to comment.