From owner-p4-projects@FreeBSD.ORG Fri Sep 2 06:43:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84AE716A421; Fri, 2 Sep 2005 06:43:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D94916A41F for ; Fri, 2 Sep 2005 06:43:01 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1101043D45 for ; Fri, 2 Sep 2005 06:43:01 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j826h0Vv004673 for ; Fri, 2 Sep 2005 06:43:00 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j826h0Jt004670 for perforce@freebsd.org; Fri, 2 Sep 2005 06:43:00 GMT (envelope-from soc-tyler@freebsd.org) Date: Fri, 2 Sep 2005 06:43:00 GMT Message-Id: <200509020643.j826h0Jt004670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 83002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2005 06:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=83002 Change 83002 by soc-tyler@soc-tyler_launchd on 2005/09/02 06:42:31 Quickstart broken, naptime Affected files ... .. //depot/projects/soc2005/launchd/launchctl/launchctl.c#20 edit Differences ... ==== //depot/projects/soc2005/launchd/launchctl/launchctl.c#20 (text+ko) ==== @@ -133,7 +133,7 @@ { "unload", load_and_unload_cmd, "Unload configuration files and/or directories" }, // { "reload", reload_cmd, "Reload configuration files and/or directories" }, { "start", start_stop_remove_cmd, "Start specified job" }, - { "quickstart", quickstart_cmd, "Load and start specified"}, + //{ "quickstart", quickstart_cmd, "Load and start specified"}, // { "stop", start_stop_remove_cmd, "Stop specified job" }, { "submit", submit_cmd, "Submit a job from the command line" }, { "remove", start_stop_remove_cmd, "Remove/stop specified job" }, @@ -384,7 +384,6 @@ if ((flags = property_find((properties)(prop), LAUNCH_PROPERTY_FLAGS)) == NULL) { - fprintf(stderr, "**debug** no flags set for this job\n"); fflag = false; free(flags); } @@ -1217,31 +1216,32 @@ } static int quickstart_cmd(int argc, char *const argv[]) { - launch_data_t pass1, pass2; // need two passes for "compat" reasons + launch_data_t pass1; launch_data_t resp, msg, label; + launch_data_t thejob; - label = launch_data_alloc(LAUNCH_DATA_STRING); - /* XXX: I need to add some error checking after the deadline */ pass1 = launch_data_alloc(LAUNCH_DATA_ARRAY); - pass2 = launch_data_alloc(LAUNCH_DATA_ARRAY); - readpath(argv[1], pass1, pass2, false, true, false); + thejob = read_conf_file(argv[1], false, true); + label = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_LABEL); /* XXX: assuming data has been read correctly */ + launch_data_array_append(pass1, thejob); submit_job_pass(pass1); - launch_data_free(pass2); - + fprintf(stderr, "finished loading in quickstart()\n"); /* end load portion */ - label = launch_data_dict_lookup(pass1, LAUNCH_JOBKEY_LABEL); + fprintf(stderr, "label of type: %d\n", launch_data_get_type(label)); + fprintf(stderr, "constructing msg data struct\n"); msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY); - launch_data_dict_insert(msg, label, LAUNCH_KEY_STARTJOB); + //launch_data_dict_insert(msg, label, LAUNCH_KEY_STARTJOB); - + fprintf(stderr, "calling launch_msg()\n"); resp = launch_msg(msg); + fprintf(stderr, "executed launch_msg()\n"); launch_data_free(msg); if (resp == NULL) {