Changeset 468 for trunk/openmct/packages/system/owi/src/file.c

Timestamp:

10/03/07 16:43:01 (5 years ago)

Author:

andi

Message:

design updates

Files:

• trunk/openmct/packages/system/owi/src/file.c (modified) (2 diffs)

trunk/openmct/packages/system/owi/src/file.c

@@ -261 +261 @@
          /* Reallocate new index array */
          file_line = (char**)realloc(file_line,
-                                                    sizeof(char *) *
-                                                    (file_line_counter + 1));
+                                     sizeof(char *) *
+                                     (file_line_counter + 1));
          /* Move pointers */
          for (i = file_line_counter - 1; i > line_index; i--) {
@@ -289 +289 @@
    return (strstr(string, match) - string) + strlen(match);
 }
+
+/* \fn proc_read_line(command, index)
+ * \param[in] proc command to execute
+ * \param[in] index return this line
+ * \return string
+ */
+char *proc_read_line(char *command, int index) {
+   int lines = proc_open(command);
+   char *line = NULL;
+
+   if (lines >= 0) {
+      if (index <= lines) {
+         line = (char*)malloc(strlen(file_line_get(index)) + 1);
+         if (line) {
+            strcpy(line, file_line_get(index));
+         }
+      }
+      file_free();
+   }
+
+   return line;
+}
+
+/* \fn file_read_line(command, index)
+ * \param[in] file to be read
+ * \param[in] index return this line
+ * \return string
+ */
+char *file_read_line(char *file, int index) {
+   int lines = file_open(file);
+   char *line = NULL;
+
+   if (lines >= 0) {
+      if (index <= lines) {
+         line = (char*)malloc(strlen(file_line_get(index)) + 1);
+         if (line) {
+            strcpy(line, file_line_get(index));
+         }
+      }
+      file_free();
+   }
+
+   return line;
+}